Skip to content

Make Object class symbol JavaDefined. #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make Object class symbol JavaDefined. #2165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,15 @@ class Definitions {
lazy val AnyValClass: ClassSymbol = completeClass(enterCompleteClassSymbol(ScalaPackageClass, tpnme.AnyVal, Abstract, List(AnyClass.typeRef)))
def AnyValType = AnyValClass.typeRef

lazy val Any_== = enterMethod(AnyClass, nme.EQ, methOfAny(BooleanType), Final)
lazy val Any_!= = enterMethod(AnyClass, nme.NE, methOfAny(BooleanType), Final)
lazy val Any_equals = enterMethod(AnyClass, nme.equals_, methOfAny(BooleanType))
lazy val Any_hashCode = enterMethod(AnyClass, nme.hashCode_, MethodType(Nil, IntType))
lazy val Any_toString = enterMethod(AnyClass, nme.toString_, MethodType(Nil, StringType))
lazy val Any_== = enterMethod(AnyClass, nme.EQ, methOfAny(BooleanType), Final | JavaDefined)
lazy val Any_!= = enterMethod(AnyClass, nme.NE, methOfAny(BooleanType), Final | JavaDefined)
lazy val Any_equals = enterMethod(AnyClass, nme.equals_, methOfAny(BooleanType), JavaDefined)
lazy val Any_hashCode = enterMethod(AnyClass, nme.hashCode_, MethodType(Nil, IntType), JavaDefined)
lazy val Any_toString = enterMethod(AnyClass, nme.toString_, MethodType(Nil, StringType), JavaDefined)
lazy val Any_## = enterMethod(AnyClass, nme.HASHHASH, ExprType(IntType), Final)
lazy val Any_getClass = enterMethod(AnyClass, nme.getClass_, MethodType(Nil, ClassClass.typeRef.appliedTo(TypeBounds.empty)), Final)
lazy val Any_isInstanceOf = enterT1ParameterlessMethod(AnyClass, nme.isInstanceOf_, _ => BooleanType, Final)
lazy val Any_asInstanceOf = enterT1ParameterlessMethod(AnyClass, nme.asInstanceOf_, PolyParam(_, 0), Final)
lazy val Any_getClass = enterMethod(AnyClass, nme.getClass_, MethodType(Nil, ClassClass.typeRef.appliedTo(TypeBounds.empty)), Final | JavaDefined)
lazy val Any_isInstanceOf = enterT1ParameterlessMethod(AnyClass, nme.isInstanceOf_, _ => BooleanType, Final | JavaDefined)
lazy val Any_asInstanceOf = enterT1ParameterlessMethod(AnyClass, nme.asInstanceOf_, PolyParam(_, 0), Final | JavaDefined)

def AnyMethods = List(Any_==, Any_!=, Any_equals, Any_hashCode,
Any_toString, Any_##, Any_getClass, Any_isInstanceOf, Any_asInstanceOf)
Expand All @@ -251,6 +251,7 @@ class Definitions {
val cls = ctx.requiredClass("java.lang.Object")
assert(!cls.isCompleted, "race for completing java.lang.Object")
cls.info = ClassInfo(cls.owner.thisType, cls, AnyClass.typeRef :: Nil, newScope)
cls.setFlag(JavaDefined)

// The companion object doesn't really exist, `NoType` is the general
// technique to do that. Here we need to set it before completing
Expand Down