diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java index 0c3ba19bbbf..f92f8dc16bc 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -260,6 +260,9 @@ public class JetTypeMapper { } if (JetStandardClasses.getAny().equals(descriptor)) { + if (signatureVisitor != null) { + visitAsmType(signatureVisitor, TYPE_OBJECT); + } return TYPE_OBJECT; } diff --git a/compiler/testData/compileJavaAgainstKotlin/Any.java b/compiler/testData/compileJavaAgainstKotlin/Any.java new file mode 100644 index 00000000000..fb9763ee19f --- /dev/null +++ b/compiler/testData/compileJavaAgainstKotlin/Any.java @@ -0,0 +1,6 @@ + +class Any { + { + Object r = namespace.anyany(new Object(), null); + } +} diff --git a/compiler/testData/compileJavaAgainstKotlin/Any.kt b/compiler/testData/compileJavaAgainstKotlin/Any.kt new file mode 100644 index 00000000000..2483cfdeb0e --- /dev/null +++ b/compiler/testData/compileJavaAgainstKotlin/Any.kt @@ -0,0 +1,2 @@ +// extra parameter is to preserve generic signature +fun anyany(a: Any, ignore: java.util.List) = a