azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around the shallowly analyzed files

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-11 13:46:50 +04:00
parent 57fb669670
commit 67d2a8dcca
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java
+5 -1
View File
@@ -111,7 +111,7 @@ public class ClosureAnnotator {
private class MyJetVisitorVoid extends JetVisitorVoid { private class MyJetVisitorVoid extends JetVisitorVoid {
private LinkedList<ClassDescriptor> classStack = new LinkedList<ClassDescriptor>(); private LinkedList<ClassDescriptor> classStack = new LinkedList<ClassDescriptor>();
private LinkedList<String> nameStack = new LinkedList<String>(); private LinkedList<String> nameStack = new LinkedList<String>();
private void recordEnclosing(ClassDescriptor classDescriptor) { private void recordEnclosing(ClassDescriptor classDescriptor) {
if(classStack.size() > 0) { if(classStack.size() > 0) {
ClassDescriptor put = enclosing.put(classDescriptor, classStack.peek()); ClassDescriptor put = enclosing.put(classDescriptor, classStack.peek());
@@ -178,6 +178,8 @@ public class ClosureAnnotator {
} }
else { else {
ClassDescriptor classDescriptor = bindingContext.get(BindingContext.CLASS, declaration); ClassDescriptor classDescriptor = bindingContext.get(BindingContext.CLASS, declaration);
// working around a problem with shallow analysis
if (classDescriptor == null) return;
recordEnclosing(classDescriptor); recordEnclosing(classDescriptor);
classStack.push(classDescriptor); classStack.push(classDescriptor);
String base = nameStack.peek(); String base = nameStack.peek();
@@ -195,6 +197,8 @@ public class ClosureAnnotator {
@Override @Override
public void visitClass(JetClass klass) { public void visitClass(JetClass klass) {
ClassDescriptor classDescriptor = bindingContext.get(BindingContext.CLASS, klass); ClassDescriptor classDescriptor = bindingContext.get(BindingContext.CLASS, klass);
// working around a problem with shallow analysis
if (classDescriptor == null) return;
recordEnclosing(classDescriptor); recordEnclosing(classDescriptor);
classStack.push(classDescriptor); classStack.push(classDescriptor);
String base = nameStack.peek(); String base = nameStack.peek();