mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 18:35:32 +02:00
Code Issues Wiki Activity

Adjustments to adaptBinding stackOverflow solution.

Browse source 
Wrapped the method in try/finally and made inProgress thread local.
This commit is contained in:
Doug Schaefer 2014-04-03 14:14:55 -04:00
parent 126da7d685
commit 1ab4528000
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
View file

@ -1085,21 +1085,22 @@ public class PDOM extends PlatformObject implements IPDOM {
return fLinkageIDCache.get(linkage.getLinkageID()); return fLinkageIDCache.get(linkage.getLinkageID());
} }
private IBinding inProgress; private ThreadLocal<IBinding> inProgress = new ThreadLocal<IBinding>();
@Override @Override
public IIndexFragmentBinding adaptBinding(IBinding binding) throws CoreException { public IIndexFragmentBinding adaptBinding(IBinding binding) throws CoreException {
if (inProgress == binding) { if (inProgress.get() == binding) {
// Detect if we're recursing during the adapt. That shouldn't happen and // Detect if we're recursing during the adapt. That shouldn't happen and
// leads to stack overflow when it does. // leads to stack overflow when it does.
return null; return null;
} }
inProgress = binding; inProgress.set(binding);
IIndexFragmentBinding result = adaptBinding(binding, true); try {
inProgress = null; return adaptBinding(binding, true);
} finally {
return result; inProgress.set(null);
}
} }
private IIndexFragmentBinding adaptBinding(IBinding binding, boolean includeLocal) throws CoreException { private IIndexFragmentBinding adaptBinding(IBinding binding, boolean includeLocal) throws CoreException {