diff --git a/project/JavaLangObject.scala b/project/JavaLangObject.scala index 8ebc44f2d6..2487e451a9 100644 --- a/project/JavaLangObject.scala +++ b/project/JavaLangObject.scala @@ -63,7 +63,7 @@ object JavaLangObject { GetClass(This()(ThisType)) })(OptimizerHints.empty.withInline(true), None), - /* def hashCode(): Int = System.identityHashCode(this) */ + /* def hashCode(): Int = (this) */ MethodDef( MemberFlags.empty, MethodIdent(MethodName("hashCode", Nil, IntRef)), @@ -71,12 +71,8 @@ object JavaLangObject { Nil, IntType, Some { - Apply( - EAF, - LoadModule(ClassName("java.lang.System$")), - MethodIdent(MethodName("identityHashCode", List(ObjectClassRef), IntRef)), - List(This()(ThisType)))(IntType) - })(OptimizerHints.empty, None), + IdentityHashCode(This()(ThisType)) + })(OptimizerHints.empty.withInline(true), None), /* def equals(that: Object): Boolean = this eq that */ MethodDef( diff --git a/project/MiniLib.scala b/project/MiniLib.scala index 2b873dc5f3..a9b9026765 100644 --- a/project/MiniLib.scala +++ b/project/MiniLib.scala @@ -5,7 +5,6 @@ object MiniLib { val inJavaLang = List( "Object", "Class", - "System", "CharSequence", "Cloneable",