4 files changed, 31 insertions, 0 deletions
diff --git a/test/files/run/reflection-names.check b/test/files/run/reflection-names.check
new file mode 100644
index 0000000000..f8cb78cc67
--- /dev/null
+++ b/test/files/run/reflection-names.check
@@ -0,0 +1,4 @@
+(java.lang.String,bc)
+(scala.reflect.internal.Names$TermName_R,bc)
+(scala.reflect.internal.Names$TypeName_R,bc)
+(scala.reflect.internal.Names$TypeName_R,bc)
diff --git a/test/files/run/reflection-names.scala b/test/files/run/reflection-names.scala
new file mode 100644
index 0000000000..2433c84813
--- /dev/null
+++ b/test/files/run/reflection-names.scala
@@ -0,0 +1,15 @@
+import scala.tools.nsc._
+
+object Test {
+  val global = new Global(new Settings())
+  import global._
+
+  val x1 = "abc" drop 1                      // "bc": String
+  val x2 = ("abc": TermName) drop 1          // "bc": TermName
+  val x3 = ("abc": TypeName) drop 1          // "bc": TypeName
+  val x4 = (("abc": TypeName): Name) drop 1  // "bc": Name
+
+  def main(args: Array[String]): Unit = {
+    List(x1, x2, x3, x4) foreach (x => println(x.getClass.getName, x))
+  }
+}
diff --git a/test/files/run/t6011b.check b/test/files/run/t6011b.check
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/test/files/run/t6011b.check
@@ -0,0 +1 @@
+3
diff --git a/test/files/run/t6011b.scala b/test/files/run/t6011b.scala
new file mode 100644
index 0000000000..3d405e0705
--- /dev/null
+++ b/test/files/run/t6011b.scala
@@ -0,0 +1,11 @@
+object Test extends App {
+  var cond = true
+
+  // should not generate a switch
+  def f(ch: Char): Int = ch match {
+    case 'a' if cond => 1
+    case 'z' | 'a' => 2
+  }
+
+  println(f('a') + f('z')) // 3
+}
+\ No newline at end of file