diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2015-03-27 14:28:10 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2015-03-27 14:28:10 +0100 |
commit | 06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3 (patch) | |
tree | c9fe235937c9c0fb3e73cb3a41cdb58f7e94e051 /src | |
parent | 6372df754ca8943a5fea3455936dbb6c1723d78e (diff) | |
download | scala-06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3.tar.gz scala-06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3.tar.bz2 scala-06b5bfa306c4c53ca4b671cb6472828b8fcdd5c3.zip |
SI-9252 gets rid of custom logic for jArrayClass in runtime reflection
Apparently, I've already fixed a very similar issue two years ago.
That was a fun surprise! (https://issues.scala-lang.org/browse/SI-5680)
Diffstat (limited to 'src')
-rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 6 |
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 3b497227e7..0e0eabb94f 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) |