diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-04-09 15:52:48 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-04-09 15:52:48 +0200 |
commit | 6e5c8f82e03069183e29543730c3f4a0191318c8 (patch) | |
tree | 9ceaab777a1aa2819f35192f894a64381ed139a5 | |
parent | 9a8f714dac2f02e961c2cdce98dec98c26dd9c3e (diff) | |
parent | 06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3 (diff) | |
download | scala-6e5c8f82e03069183e29543730c3f4a0191318c8.tar.gz scala-6e5c8f82e03069183e29543730c3f4a0191318c8.tar.bz2 scala-6e5c8f82e03069183e29543730c3f4a0191318c8.zip |
Merge pull request #4411 from xeno-by/ticket/9252
SI-9252 gets rid of custom logic for jArrayClass in runtime reflection
-rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 6 | ||||
-rw-r--r-- | test/files/run/t9252.check | 1 | ||||
-rw-r--r-- | test/files/run/t9252.scala | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index 6efac6d873..237efd004f 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -1285,16 +1285,12 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive jclazz getDeclaredConstructor (effectiveParamClasses: _*) } - private def jArrayClass(elemClazz: jClass[_]): jClass[_] = { - jArray.newInstance(elemClazz, 0).getClass - } - /** The Java class that corresponds to given Scala type. * Pre: Scala type is already transformed to Java level. */ def typeToJavaClass(tpe: Type): jClass[_] = tpe match { case ExistentialType(_, rtpe) => typeToJavaClass(rtpe) - case TypeRef(_, ArrayClass, List(elemtpe)) => jArrayClass(typeToJavaClass(elemtpe)) + case TypeRef(_, ArrayClass, List(elemtpe)) => ScalaRunTime.arrayClass(typeToJavaClass(elemtpe)) case TypeRef(_, sym: ClassSymbol, _) => classToJava(sym.asClass) case tpe @ TypeRef(_, sym: AliasTypeSymbol, _) => typeToJavaClass(tpe.dealias) case SingleType(_, sym: ModuleSymbol) => classToJava(sym.moduleClass.asClass) diff --git a/test/files/run/t9252.check b/test/files/run/t9252.check new file mode 100644 index 0000000000..b00d748f7f --- /dev/null +++ b/test/files/run/t9252.check @@ -0,0 +1 @@ +class [Lscala.runtime.BoxedUnit; diff --git a/test/files/run/t9252.scala b/test/files/run/t9252.scala new file mode 100644 index 0000000000..da698948e1 --- /dev/null +++ b/test/files/run/t9252.scala @@ -0,0 +1,5 @@ +import scala.reflect.runtime.universe._ + +object Test extends App { + println(rootMirror.runtimeClass(typeOf[Array[Unit]])) +}
\ No newline at end of file |