summaryrefslogtreecommitdiff
path: root/sources/scalac/symtab/classfile/JavaTypeCreator.java
diff options
context:
space:
mode:
Diffstat (limited to 'sources/scalac/symtab/classfile/JavaTypeCreator.java')
-rw-r--r--sources/scalac/symtab/classfile/JavaTypeCreator.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java
index 9ef282ba56..395778adec 100644
--- a/sources/scalac/symtab/classfile/JavaTypeCreator.java
+++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java
@@ -72,10 +72,16 @@ public class JavaTypeCreator implements JavaTypeFactory {
for (int i = 0; i < args.length; i++) {
args[i] = new TermSymbol(
Position.NOPOS, Name.fromString("x" + i), Symbol.NONE, Modifiers.PARAM);
- args[i].setInfo(argtpes[i]);
+ args[i].setInfo(objToAny(argtpes[i]));
}
return new MethodType(args, restpe);
}
+ private Type objToAny(Type tp) {
+ if (tp.isSameAs(global.definitions.JAVA_OBJECT_TYPE))
+ return global.definitions.ANY_TYPE;
+ else
+ return tp;
+ }
public Type packageType(Name packagename) {
return null;