diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-21 10:14:38 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-21 10:14:38 +0200 |
| commit | efc1f198b47d1c853b8d5600dfbfb7378a38fe51 (patch) | |
| tree | 239d3f08621fd43e365fb7b4164535818a63a48e /src/reflect | |
| parent | 56d79460dc3e9dbec054c1459122f5b87989f4e3 (diff) | |
| parent | fedbfd74f2d874ef3851f6ce2261011877ac505d (diff) | |
| download | scala-efc1f198b47d1c853b8d5600dfbfb7378a38fe51.tar.gz scala-efc1f198b47d1c853b8d5600dfbfb7378a38fe51.tar.bz2 scala-efc1f198b47d1c853b8d5600dfbfb7378a38fe51.zip | |
Merge commit 'fedbfd7' into merge/2.11-to-2.12-apr-21
Diffstat (limited to 'src/reflect')
| -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 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) |