KT-1149 static type info field for unarameterized traits

This commit is contained in:
Alex Tkachman
2012-02-12 09:04:18 +02:00
parent be5e11f2a5
commit 84ed18c7e2
2 changed files with 30 additions and 4 deletions
@@ -942,11 +942,11 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
private void generateGetTypeInfo() {
if(myClass instanceof JetClass && ((JetClass)myClass).isTrait())
return;
JetType defaultType = descriptor.getDefaultType();
if(CodegenUtil.requireTypeInfoConstructorArg(defaultType)) {
if(myClass instanceof JetClass && ((JetClass)myClass).isTrait())
return;
if(!CodegenUtil.hasDerivedTypeInfoField(defaultType)) {
v.newField(myClass, ACC_PROTECTED, JvmAbi.TYPE_INFO_FIELD, "Ljet/TypeInfo;", null, null);
@@ -975,7 +975,10 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
}
else {
genGetStaticGetTypeInfoMethod();
if (!(myClass instanceof JetClass) || !((JetClass) myClass).isTrait()) {
genGetStaticGetTypeInfoMethod();
}
staticTypeInfoField();
}
}
+23
View File
@@ -0,0 +1,23 @@
package test.regressions.kt1149
import java.util.ArrayList
import std.util.*
import junit.framework.*
public trait SomeTrait {
fun foo()
}
class Kt1149Test() : TestCase() {
fun testMe() {
val list = ArrayList<SomeTrait>()
var res = ArrayList<String>()
list.add(object : SomeTrait {
override fun foo() {
res.add("anonymous.foo()")
}
})
list.foreach{ it.foo() }
Assert.assertEquals("anonymous.foo()", res[0])
}
}