Merge pull request #94 from sjrd/getclass-char-long-box

Fix #77: Fix getClass() for the Box classes.

Author: tanishiking

Diff for: build.sbt

@@ -242,9 +242,6 @@ lazy val IgnoredTestNames: Set[String] = {
     "org.scalajs.testsuite.compiler.ReflectionTest",
     "org.scalajs.testsuite.compiler.RuntimeTypeTestsJSTest",
     "org.scalajs.testsuite.jsinterop.ModulesTest",
-    // getClass for Box classes
-    "org.scalajs.testsuite.javalib.lang.ClassTest",
-    "org.scalajs.testsuite.javalib.lang.ObjectTest",
     // eqEqJLFloat/eqEqJLDouble failed: java.lang.AssertionError: null
     "org.scalajs.testsuite.compiler.RegressionTest",
     // TypeError: WebAssembly objects are opaque

Diff for: wasm/src/main/scala/ir2wasm/HelperFunctions.scala

@@ -1077,6 +1077,7 @@ object HelperFunctions {
     val typeDataLocal = fctx.addLocal("typeData", typeDataType)
     val doubleValueLocal = fctx.addLocal("doubleValue", WasmFloat64)
     val intValueLocal = fctx.addLocal("intValue", WasmInt32)
+    val ourObjectLocal = fctx.addLocal("ourObject", WasmRefType(WasmHeapType.ObjectType))
 
     def getHijackedClassTypeDataInstr(className: IRNames.ClassName): WasmInstr =
       GLOBAL_GET(WasmGlobalName.forVTable(className))
@@ -1192,7 +1193,28 @@ object HelperFunctions {
           instrs += BR(gotTypeDataLabel)
         }
 
-        instrs += STRUCT_GET(WasmStructTypeName.forClass(IRNames.ObjectClass), WasmFieldIdx.vtable)
+        /* Now we have one of our objects. Normally we only have to get the
+         * vtable, but there are two exceptions. If the value is an instance of
+         * `jl.CharacterBox` or `jl.LongBox`, we must use the typeData of
+         * `jl.Character` or `jl.Long`, respectively.
+         */
+        instrs += LOCAL_TEE(ourObjectLocal)
+        instrs += REF_TEST(WasmRefType(WasmStructTypeName.forClass(SpecialNames.CharBoxClass)))
+        fctx.ifThenElse(typeDataType) {
+          instrs += getHijackedClassTypeDataInstr(IRNames.BoxedCharacterClass)
+        } {
+          instrs += LOCAL_GET(ourObjectLocal)
+          instrs += REF_TEST(WasmRefType(WasmStructTypeName.forClass(SpecialNames.LongBoxClass)))
+          fctx.ifThenElse(typeDataType) {
+            instrs += getHijackedClassTypeDataInstr(IRNames.BoxedLongClass)
+          } {
+            instrs += LOCAL_GET(ourObjectLocal)
+            instrs += STRUCT_GET(
+              WasmStructTypeName.forClass(IRNames.ObjectClass),
+              WasmFieldIdx.vtable
+            )
+          }
+        }
       }
 
       instrs += CALL(WasmFunctionName.getClassOf)