diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-06-10 06:20:37 -0400 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-06-10 06:20:37 -0400 |
| commit | 549cb905aa6a4facb3cb12628a76ab8273658170 (patch) | |
| tree | 0213972eb9f2fb3f82472063873bf90e18f0446c /src/reflect | |
| parent | 16c31f4923b3714d2780f0a494b3da07c1ac12bc (diff) | |
| parent | e3c318649c4318412c8d7e3cbee4689489f6ccb1 (diff) | |
| download | scala-549cb905aa6a4facb3cb12628a76ab8273658170.tar.gz scala-549cb905aa6a4facb3cb12628a76ab8273658170.tar.bz2 scala-549cb905aa6a4facb3cb12628a76ab8273658170.zip | |
Merge branch '2.10.x' into topic/merge-v2.10.2-RC1-35-ga54d86b-to-master
Conflicts:
src/partest/scala/tools/partest/DirectTest.scala
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/CapturedVariables.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/reflect/scala/reflect/internal/CapturedVariables.scala b/src/reflect/scala/reflect/internal/CapturedVariables.scala index 2c5e87b95d..ef9646b80f 100644 --- a/src/reflect/scala/reflect/internal/CapturedVariables.scala +++ b/src/reflect/scala/reflect/internal/CapturedVariables.scala @@ -30,7 +30,7 @@ trait CapturedVariables { self: SymbolTable => def refType(valueRef: Map[Symbol, Symbol], objectRefClass: Symbol) = if (isPrimitiveValueClass(symClass) && symClass != UnitClass) valueRef(symClass).tpe else if (erasedTypes) objectRefClass.tpe - else appliedType(objectRefClass, tpe) + else appliedType(objectRefClass, tpe1) if (vble.hasAnnotation(VolatileAttr)) refType(volatileRefClass, VolatileObjectRefClass) else refType(refClass, ObjectRefClass) } diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index a3684f602f..16405a88b4 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -581,15 +581,10 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni loadBytes[Array[String]]("scala.reflect.ScalaLongSignature") match { case Some(slsig) => info(s"unpickling Scala $clazz and $module with long Scala signature") - val byteSegments = slsig map (_.getBytes) - val lens = byteSegments map ByteCodecs.decode - val bytes = Array.ofDim[Byte](lens.sum) - var len = 0 - for ((bs, l) <- byteSegments zip lens) { - bs.copyToArray(bytes, len, l) - len += l - } - unpickler.unpickle(bytes, 0, clazz, module, jclazz.getName) + val encoded = slsig flatMap (_.getBytes) + val len = ByteCodecs.decode(encoded) + val decoded = encoded.take(len) + unpickler.unpickle(decoded, 0, clazz, module, jclazz.getName) case None => // class does not have a Scala signature; it's a Java class info("translating reflection info for Java " + jclazz) //debug |