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

Don't make traits and annotations inherit from KObject

Browse Source 
#KT-5609 Fixed
This commit is contained in:
Alexander Udalov
2014-08-12 12:03:32 +04:00
parent 47d5f83d04
commit 226bfe65f0
10 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -2
View File
@@ -65,7 +65,6 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.org.objectweb.asm.*;
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
import org.jetbrains.org.objectweb.asm.commons.Method;
@@ -369,7 +368,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
LinkedHashSet<String> superInterfaces = new LinkedHashSet<String>();
if (!explicitKObject) {
if (!explicitKObject && !isInterface(descriptor)) {
Type kObject = asmTypeByFqNameWithoutInnerClasses(JvmAbi.K_OBJECT);
sw.writeInterface();
sw.writeClassBegin(kObject);