1 files changed, 15 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
index 3ed128cbc5..6de95ab658 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -5,17 +5,13 @@ import java.lang.Math.min
 import symtab.Flags._
 import scala.reflect.internal.util.ScalaClassLoader
 import scala.reflect.runtime.ReflectionUtils
-import scala.collection.mutable.ListBuffer
-import scala.reflect.ClassTag
 import scala.reflect.internal.util.Statistics
 import scala.reflect.macros.util._
 import scala.util.control.ControlThrowable
 import scala.reflect.internal.util.ListOfNil
 import scala.reflect.macros.runtime.{AbortMacroException, MacroRuntimes}
-import scala.reflect.runtime.{universe => ru}
 import scala.reflect.macros.compiler.DefaultMacroCompiler
 import scala.tools.reflect.FastTrack
-import scala.runtime.ScalaRunTime
 import Fingerprint._
 
 /**
@@ -242,7 +238,7 @@ trait Macros extends MacroRuntimes with Traces with Helpers {
         if (!payload.contains(field)) failField("is supposed to be there")
         val raw: Any = payload(field)
         if (raw == null) failField(s"is not supposed to be null")
-        val expected = ScalaRunTime.box(clazz)
+        val expected = box(clazz)
         val actual = raw.getClass
         if (!expected.isAssignableFrom(actual)) failField(s"has wrong type: expected $expected, actual $actual")
         raw.asInstanceOf[T]
@@ -259,6 +255,19 @@ trait Macros extends MacroRuntimes with Traces with Helpers {
       val signature = unpickle("signature", classOf[List[List[Fingerprint]]])
       MacroImplBinding(isBundle, isBlackbox, className, methodName, signature, targs)
     }
+
+    private def box[T](clazz: Class[T]): Class[_] = clazz match {
+      case java.lang.Byte.TYPE => classOf[java.lang.Byte]
+      case java.lang.Short.TYPE => classOf[java.lang.Short]
+      case java.lang.Character.TYPE => classOf[java.lang.Character]
+      case java.lang.Integer.TYPE => classOf[java.lang.Integer]
+      case java.lang.Long.TYPE => classOf[java.lang.Long]
+      case java.lang.Float.TYPE => classOf[java.lang.Float]
+      case java.lang.Double.TYPE => classOf[java.lang.Double]
+      case java.lang.Void.TYPE => classOf[scala.runtime.BoxedUnit]
+      case java.lang.Boolean.TYPE => classOf[java.lang.Boolean]
+      case _ => clazz
+    }
   }
 
   def bindMacroImpl(macroDef: Symbol, macroImplRef: Tree): Unit = {
@@ -688,7 +697,7 @@ trait Macros extends MacroRuntimes with Traces with Helpers {
       //   foo(Foo(23, "foo", true))
       //
       // In the snippet above, even though we know that there's a fundep going from T to U
-      // (in a sense that a datatype's uniform representation is unambiguously determined by the datatype,
+      // (in a sense that a datatype's uniform representation is unambiguously determined by the data type,
       // e.g. for Foo it will be Int :: String :: Boolean :: HNil), there's no way to convey this information
       // to the typechecker. Therefore the typechecker will infer Nothing for L, which is hardly what we want.
       //