diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/backend/jvm/GenJVM.java | 2 | ||||
| -rw-r--r-- | sources/scalac/symtab/Type.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java index de2f1594ba..8b92ce7e21 100644 --- a/sources/scalac/backend/jvm/GenJVM.java +++ b/sources/scalac/backend/jvm/GenJVM.java @@ -1462,7 +1462,7 @@ class GenJVM { int offset; String superClassName; if (cSym.isInterface()) { - offset = baseTps[0].isSameAs(defs.ANY_TYPE) ? 1 : 0; + offset = baseTps[0].symbol() == defs.ANY_CLASS ? 1 : 0; superClassName = JAVA_LANG_OBJECT; } else { offset = 1; diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java index 37662b443e..bb4a63f7ce 100644 --- a/sources/scalac/symtab/Type.java +++ b/sources/scalac/symtab/Type.java @@ -2757,7 +2757,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { fullname == Names.scala_AnyVal || fullname == Names.scala_All || fullname == Names.scala_AllRef) - return Global.instance.definitions.ANY_TYPE; + return TypeRef(localThisType, Global.instance.definitions.ANY_CLASS, EMPTY_ARRAY); else { Type this1 = unbox(); if (this1 != this) return this1; |