summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-06-05 13:09:51 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-06-05 13:09:51 +0200
commitdd5fa60c1d56587b07548c01ea70a0077a9f1fa3 (patch)
treef2997b396fcc3850a4d97c3d332e8f85f0886b30 /src
parent1472dadd03496aa89624c81ded01edeb71420cc3 (diff)
downloadscala-dd5fa60c1d56587b07548c01ea70a0077a9f1fa3.tar.gz
scala-dd5fa60c1d56587b07548c01ea70a0077a9f1fa3.tar.bz2
scala-dd5fa60c1d56587b07548c01ea70a0077a9f1fa3.zip
SI-7558 Fix capture of free local vars in toolbox compiler
It was creating an `ObjectRef[<notype>]` because of a small bug in `capturedVariableType`.
Diffstat (limited to 'src')
-rw-r--r--src/reflect/scala/reflect/internal/CapturedVariables.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/CapturedVariables.scala b/src/reflect/scala/reflect/internal/CapturedVariables.scala
index 77909d9157..a3d2a8bd94 100644
--- a/src/reflect/scala/reflect/internal/CapturedVariables.scala
+++ b/src/reflect/scala/reflect/internal/CapturedVariables.scala
@@ -29,7 +29,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)
}