summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-24 15:56:33 -0700
committerPaul Phillips <paulp@improving.org>2012-04-24 15:56:33 -0700
commit7f083d8d25dad2af9675521cc1daee35b4029769 (patch)
tree49122d7abfd1288d93afc628a26a2b64b69d3365 /src
parent996f96fb3f84b87d8761cb360d441a57a3db60ee (diff)
parentf32d301fb556e006ae40b27175c4a4ca0e548616 (diff)
downloadscala-7f083d8d25dad2af9675521cc1daee35b4029769.tar.gz
scala-7f083d8d25dad2af9675521cc1daee35b4029769.tar.bz2
scala-7f083d8d25dad2af9675521cc1daee35b4029769.zip
Merge commit 'refs/pull/433/head' into develop
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/reflect/runtime/ToolBoxes.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/runtime/ToolBoxes.scala b/src/compiler/scala/reflect/runtime/ToolBoxes.scala
index 21a90326cf..7b1fc9fc0d 100644
--- a/src/compiler/scala/reflect/runtime/ToolBoxes.scala
+++ b/src/compiler/scala/reflect/runtime/ToolBoxes.scala
@@ -113,7 +113,7 @@ trait ToolBoxes extends { self: Universe =>
override def transform(tree: Tree): Tree =
tree match {
case Ident(name) if reversedFreeTermNames contains name =>
- Ident(reversedFreeTermNames(name))
+ Ident(reversedFreeTermNames(name)) setType tree.tpe
case _ =>
super.transform(tree)
}