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

codegen: ClosureAnnotator: restore assertion

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-02 03:08:55 +04:00
parent d6e8c57d11
commit e42b5017ac
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java
+2 -7
View File
@@ -256,7 +256,6 @@ public class ClosureAnnotator {
// working around a problem with shallow analysis // working around a problem with shallow analysis
if (declarationDescriptor == null) return; if (declarationDescriptor == null) return;
ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(declarationDescriptor, name); ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(declarationDescriptor, name);
recordName(classDescriptor, name);
recordEnclosing(classDescriptor); recordEnclosing(classDescriptor);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(classNameForClassDescriptor(classDescriptor).getInternalName()); nameStack.push(classNameForClassDescriptor(classDescriptor).getInternalName());
@@ -294,7 +293,6 @@ public class ClosureAnnotator {
else { else {
JvmClassName name = recordAnonymousClass(function); JvmClassName name = recordAnonymousClass(function);
ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(functionDescriptor, name); ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(functionDescriptor, name);
recordName(classDescriptor, name);
recordEnclosing(classDescriptor); recordEnclosing(classDescriptor);
classStack.push(classDescriptor); classStack.push(classDescriptor);
nameStack.push(name.getInternalName()); nameStack.push(name.getInternalName());
@@ -307,11 +305,8 @@ public class ClosureAnnotator {
private void recordName(@NotNull ClassDescriptor classDescriptor, @NotNull JvmClassName name) { private void recordName(@NotNull ClassDescriptor classDescriptor, @NotNull JvmClassName name) {
JvmClassName old = classNamesForClassDescriptor.put(classDescriptor, name); JvmClassName old = classNamesForClassDescriptor.put(classDescriptor, name);
if (old == null) { if (old != null) {
// TODO: fix this assertion throw new IllegalStateException("rewrite at key " + classDescriptor);
// previosly here was incorrect assert that was ignored without -ea
// stepan.koltsov@ 2012-04-08
//throw new IllegalStateException("rewrite at key " + classDescriptor);
} }
} }