summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-04-09 15:52:48 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-04-09 15:52:48 +0200
commit6e5c8f82e03069183e29543730c3f4a0191318c8 (patch)
tree9ceaab777a1aa2819f35192f894a64381ed139a5 /src
parent9a8f714dac2f02e961c2cdce98dec98c26dd9c3e (diff)
parent06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3 (diff)
downloadscala-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
Diffstat (limited to 'src')
-rw-r--r--src/reflect/scala/reflect/runtime/JavaMirrors.scala6
1 files changed, 1 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)