Add mising primitive struct for Unit

Fix #394
scala-native · Nov 18, 2016 · 48f81de · 48f81de
1 parent e81bd22
commit 48f81de
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala b/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala
@@ -37,3 +37,7 @@ import native._
 // ###sourceLocation(file: "/Users/Denys/.src/native/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala.gyb", line: 12)
 
 @struct class PrimitiveDouble private ()
+
+// ###sourceLocation(file: "/Users/Denys/.src/native/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala.gyb", line: 12)
+
+@struct class PrimitiveUnit private ()
diff --git a/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala.gyb b/nativelib/src/main/scala/scala/scalanative/runtime/Primitives.scala.gyb
@@ -5,7 +5,7 @@ import native._
 
 %{
     primitives = ['Boolean', 'Char', 'Byte', 'Short',
-                  'Int', 'Long', 'Float', 'Double']
+                  'Int', 'Long', 'Float', 'Double', 'Unit']
 }%
 
 % for T in primitives:

diff --git a/nscplugin/src/main/scala/scala/scalanative/nscplugin/NirDefinitions.scala b/nscplugin/src/main/scala/scala/scalanative/nscplugin/NirDefinitions.scala
@@ -109,7 +109,8 @@ trait NirDefinitions { self: NirGlobalAddons =>
       'I' -> getRequiredClass("scala.scalanative.runtime.PrimitiveInt"),
       'L' -> getRequiredClass("scala.scalanative.runtime.PrimitiveLong"),
       'F' -> getRequiredClass("scala.scalanative.runtime.PrimitiveFloat"),
-      'D' -> getRequiredClass("scala.scalanative.runtime.PrimitiveDouble")
+      'D' -> getRequiredClass("scala.scalanative.runtime.PrimitiveDouble"),
+      'U' -> getRequiredClass("scala.scalanative.runtime.PrimitiveUnit")
     )
 
     lazy val RuntimeArrayClass: Map[Char, Symbol] = Map(

diff --git a/nscplugin/src/main/scala/scala/scalanative/nscplugin/NirTypeEncoding.scala b/nscplugin/src/main/scala/scala/scalanative/nscplugin/NirTypeEncoding.scala
@@ -72,8 +72,12 @@ trait NirTypeEncoding { self: NirCodeGen =>
 
   def genTypeSymValue(sym: Symbol): nir.Val =
     genPrimCode(sym) match {
-      case 'O'  => nir.Val.Global(genTypeName(sym), nir.Type.Ptr)
-      case code => genTypeSymValue(RuntimePrimitive(code))
+      case 'O' if sym != UnitClass =>
+        nir.Val.Global(genTypeName(sym), nir.Type.Ptr)
+      case 'O' =>
+        genTypeSymValue(RuntimePrimitive('U'))
+      case code =>
+        genTypeSymValue(RuntimePrimitive(code))
     }
 
   def genStructFields(sym: Symbol): Seq[nir.Type] = {

diff --git a/unit-tests/src/main/scala/scala/ClassOfSuite.scala b/unit-tests/src/main/scala/scala/ClassOfSuite.scala
@@ -0,0 +1,15 @@
+package scala
+
+object ClassOfSuite extends tests.Suite {
+  test("boxed and unboxed classes are not the same") {
+    assert(classOf[Boolean] != classOf[java.lang.Boolean])
+    assert(classOf[Byte] != classOf[java.lang.Byte])
+    assert(classOf[Char] != classOf[java.lang.Character])
+    assert(classOf[Short] != classOf[java.lang.Short])
+    assert(classOf[Int] != classOf[java.lang.Integer])
+    assert(classOf[Long] != classOf[java.lang.Long])
+    assert(classOf[Float] != classOf[java.lang.Float])
+    assert(classOf[Double] != classOf[java.lang.Double])
+    assert(classOf[Unit] != classOf[scala.runtime.BoxedUnit])
+  }
+}