Merge pull request scala-js#4702 from sjrd/inline-idhashcode-in-objec…

…t-hashcode Manually inline System.identityHashCode into Object.hashCode.
armanbilge · Jul 25, 2022 · c6ac7d3 · c6ac7d3
2 parents 8bc832f + 2103212
commit c6ac7d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/project/JavaLangObject.scala b/project/JavaLangObject.scala
@@ -63,20 +63,16 @@ object JavaLangObject {
             GetClass(This()(ThisType))
           })(OptimizerHints.empty.withInline(true), None),
 
-        /* def hashCode(): Int = System.identityHashCode(this) */
+        /* def hashCode(): Int = <identityHashCode>(this) */
         MethodDef(
           MemberFlags.empty,
           MethodIdent(MethodName("hashCode", Nil, IntRef)),
           NoOriginalName,
           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
@@ -5,7 +5,6 @@ object MiniLib {
     val inJavaLang = List(
         "Object",
         "Class",
-        "System",
 
         "CharSequence",
         "Cloneable",