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

Fix outer info generation for scripts

Browse Source
This commit is contained in:
Michael Bogdanov
2015-05-18 18:15:16 +03:00
parent 0426291bd7
commit 0cb4b8f8d4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+6 -4
View File
@@ -246,9 +246,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
String outerClassInternalName = null; String outerClassInternalName = null;
if (containing instanceof ClassDescriptor) { if (containing instanceof ClassDescriptor) {
outerClassInternalName = typeMapper.mapClass((ClassDescriptor) containing).getInternalName(); outerClassInternalName = typeMapper.mapClass((ClassDescriptor) containing).getInternalName();
} else if (containing instanceof ScriptDescriptor) { } /* disabled cause of KT-7775
else if (containing instanceof ScriptDescriptor) {
outerClassInternalName = asmTypeForScriptDescriptor(bindingContext, (ScriptDescriptor) containing).getInternalName(); outerClassInternalName = asmTypeForScriptDescriptor(bindingContext, (ScriptDescriptor) containing).getInternalName();
} }*/
String innerName = innerClass.getName().isSpecial() ? null : innerClass.getName().asString(); String innerName = innerClass.getName().isSpecial() ? null : innerClass.getName().asString();
@@ -285,9 +286,10 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
} }
else if (outermost instanceof PackageContext && !(outermost instanceof PackageFacadeContext)) { else if (outermost instanceof PackageContext && !(outermost instanceof PackageFacadeContext)) {
return PackagePartClassUtils.getPackagePartType(element.getContainingJetFile()); return PackagePartClassUtils.getPackagePartType(element.getContainingJetFile());
} else if (outermost instanceof ScriptContext) { }/*disabled cause of KT-7775
else if (outermost instanceof ScriptContext) {
return asmTypeForScriptDescriptor(bindingContext, ((ScriptContext) outermost).getScriptDescriptor()); return asmTypeForScriptDescriptor(bindingContext, ((ScriptContext) outermost).getScriptDescriptor());
} }*/
return null; return null;
} }