16 files changed, 15 insertions, 28 deletions
diff --git a/src/compiler/scala/reflect/reify/phases/Calculate.scala b/src/compiler/scala/reflect/reify/phases/Calculate.scala
index e4f3fce407..93ef46472e 100644
--- a/src/compiler/scala/reflect/reify/phases/Calculate.scala
+++ b/src/compiler/scala/reflect/reify/phases/Calculate.scala
@@ -46,6 +46,7 @@ trait Calculate {
         bindRelatedSymbol(tree.symbol.companionClass, "companionClass")
         bindRelatedSymbol(tree.symbol.companionModule, "companionModule")
         Some(tree.symbol) collect { case termSymbol: TermSymbol => bindRelatedSymbol(termSymbol.referenced, "referenced") }
+        Some(tree) collect { case labelDef: LabelDef => labelDef.params foreach (param => bindRelatedSymbol(param.symbol, "labelParam")) }
         def bindRelatedSymbol(related: Symbol, name: String): Unit =
           if (related != null && related != NoSymbol) {
             if (reifyDebug) println("boundSym (" + name + "): " + related)
diff --git a/test/files/run/t5271_1.check b/test/files/run/t5271_1.check
index 7a728e5164..5245173228 100644
--- a/test/files/run/t5271_1.check
+++ b/test/files/run/t5271_1.check
@@ -9,3 +9,4 @@
   };
   ()
 }
+()
diff --git a/test/files/run/t5271_1.scala b/test/files/run/t5271_1.scala
index 5baa57c290..20cafa6a08 100644
--- a/test/files/run/t5271_1.scala
+++ b/test/files/run/t5271_1.scala
@@ -7,4 +7,5 @@ object Test extends App {
 
   val toolbox = mkToolBox()
   println(code.tree)
+  println(code.eval)
 }
diff --git a/test/files/run/t5271_2.check b/test/files/run/t5271_2.check
index d8d6edeffc..0765b3a6a4 100644
--- a/test/files/run/t5271_2.check
+++ b/test/files/run/t5271_2.check
@@ -10,3 +10,5 @@
   val c = C.apply(2, 2);
   scala.this.Predef.println(c.foo.$times(c.bar))
 }
+4
+()
diff --git a/test/files/run/t5271_2.scala b/test/files/run/t5271_2.scala
index 9820ebe692..af6491407c 100644
--- a/test/files/run/t5271_2.scala
+++ b/test/files/run/t5271_2.scala
@@ -9,4 +9,5 @@ object Test extends App {
 
   val toolbox = mkToolBox()
   println(code.tree)
+  println(code.eval)
 }
diff --git a/test/files/run/t5271_3.check b/test/files/run/t5271_3.check
index 1d4f47c5df..2b920a36a8 100644
--- a/test/files/run/t5271_3.check
+++ b/test/files/run/t5271_3.check
@@ -17,3 +17,5 @@
   val c = C.apply(2, 2);
   scala.this.Predef.println(c.foo.$times(c.bar).$eq$eq(C.qwe))
 }
+true
+()
diff --git a/test/files/run/t5271_3.scala b/test/files/run/t5271_3.scala
index 5fd94f4a2b..646b10a8e5 100644
--- a/test/files/run/t5271_3.scala
+++ b/test/files/run/t5271_3.scala
@@ -10,4 +10,5 @@ object Test extends App {
 
   val toolbox = mkToolBox()
   println(code.tree)
+  println(code.eval)
 }
diff --git a/test/pending/run/t5258a.scala b/test/pending/run/t5258a.scala
index 755d135468..127829c724 100644
--- a/test/pending/run/t5258a.scala
+++ b/test/pending/run/t5258a.scala
@@ -1,3 +1,5 @@
+import scala.reflect.mirror._
+
 object Test extends App {
   reify {
     println(classOf[Int])
diff --git a/test/pending/run/t5258b.scala b/test/pending/run/t5258b.scala
index 8ad1ff114e..82555cde96 100644
--- a/test/pending/run/t5258b.scala
+++ b/test/pending/run/t5258b.scala
@@ -1,3 +1,5 @@
+import scala.reflect.mirror._
+
 object Test extends App {
   reify {
     class C
diff --git a/test/pending/run/t5258c.scala b/test/pending/run/t5258c.scala
index 1f76391162..a0a1647486 100644
--- a/test/pending/run/t5258c.scala
+++ b/test/pending/run/t5258c.scala
@@ -1,3 +1,5 @@
+import scala.reflect.mirror._
+
 object Test extends App {
   reify {
     object E extends Enumeration { val foo, bar = Value }
diff --git a/test/pending/run/t5271_1.check b/test/pending/run/t5271_1.check
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/pending/run/t5271_1.check
+++ /dev/null
diff --git a/test/pending/run/t5271_1.scala b/test/pending/run/t5271_1.scala
deleted file mode 100644
index fae64350e3..0000000000
--- a/test/pending/run/t5271_1.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  reify {
-    case class C(foo: Int, bar: Int)
-  }.eval
-}
diff --git a/test/pending/run/t5271_2.check b/test/pending/run/t5271_2.check
deleted file mode 100644
index b8626c4cff..0000000000
--- a/test/pending/run/t5271_2.check
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/test/pending/run/t5271_2.scala b/test/pending/run/t5271_2.scala
deleted file mode 100644
index d25e1fe804..0000000000
--- a/test/pending/run/t5271_2.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  reify {
-    case class C(foo: Int, bar: Int)
-    val c = C(2, 2)
-    println(c.foo * c.bar)
-  }.eval
-}
diff --git a/test/pending/run/t5271_3.check b/test/pending/run/t5271_3.check
deleted file mode 100644
index f32a5804e2..0000000000
--- a/test/pending/run/t5271_3.check
+++ /dev/null
@@ -1 +0,0 @@
-true
-\ No newline at end of file
diff --git a/test/pending/run/t5271_3.scala b/test/pending/run/t5271_3.scala
deleted file mode 100644
index 65a03ae323..0000000000
--- a/test/pending/run/t5271_3.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  reify {
-    object C { def qwe = 4 }
-    case class C(foo: Int, bar: Int)
-    val c = C(2, 2)
-    println(c.foo * c.bar == C.qwe)
-  }.eval
-}