Merge commit 'ac432bcde6' into pr/merge-2.10

* commit 'ac432bcde6':
  Fix broken build.
  SI-6434 Pretty print function types with by name arg as (=> A) => B
  Removed class files.
  SI-6994 Avoid spurious promiscuous catch warning
  Addressing warnings.
  SI-6439 Avoid spurious REPL warnings about companionship
  use ArrayBuffer instead of Array to build Formulae
  SI-6942 more efficient unreachability analysis
  use Constant::isIntRange even if it's NIH
  SI-6956 determine switchability by type, not tree
  SI-5568 Comment improvements for getClass on primitive intersection.
  SI-5568 Fixes verify error from getClass on refinement of value type
  SI-6923 Context now buffers warnings as well as errors

Conflicts:
	src/compiler/scala/tools/nsc/interpreter/IMain.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	test/files/neg/t4851.check

Note:
  This merge excludes b07228aebe7a as it breaks master.

21 files changed, 514 insertions, 11 deletions

diff --git a/test/files/neg/catch-all.check b/test/files/neg/catch-all.check
index 2d58dd99a8..aaf51480c3 100644
--- a/test/files/neg/catch-all.check
+++ b/test/files/neg/catch-all.check
@@ -1,13 +1,10 @@
-catch-all.scala:2: warning: This catches all Throwables, which often has undesirable consequences.
-If intentional, use `case _ : Throwable` to clear this warning.
+catch-all.scala:2: warning: This catches all Throwables. If this is really intended, use `case _ : Throwable` to clear this warning.
   try { "warn" } catch { case _ => }
                               ^
-catch-all.scala:4: warning: This catches all Throwables, which often has undesirable consequences.
-If intentional, use `case x : Throwable` to clear this warning.
+catch-all.scala:4: warning: This catches all Throwables. If this is really intended, use `case x : Throwable` to clear this warning.
   try { "warn" } catch { case x => }
                               ^
-catch-all.scala:6: warning: This catches all Throwables, which often has undesirable consequences.
-If intentional, use `case x : Throwable` to clear this warning.
+catch-all.scala:6: warning: This catches all Throwables. If this is really intended, use `case x : Throwable` to clear this warning.
   try { "warn" } catch { case _: RuntimeException => ; case x => }
                                                             ^
 error: No warnings can be incurred under -Xfatal-warnings.
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index 6f9dc7d127..f6bd703e1f 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -134,9 +134,17 @@ names-defaults-neg.scala:144: error: variable definition needs type because 'x'
 names-defaults-neg.scala:147: error: variable definition needs type because 'x' is used as a named argument in its body.
   object t6 { var x = t.f(x = 1) }
                   ^
+names-defaults-neg.scala:147: warning: type-checking the invocation of method f checks if the named argument expression 'x = ...' is a valid assignment
+in the current scope. The resulting type inference error (see above) can be fixed by providing an explicit type in the local definition for x.
+  object t6 { var x = t.f(x = 1) }
+                            ^
 names-defaults-neg.scala:150: error: variable definition needs type because 'x' is used as a named argument in its body.
   class t9 { var x = t.f(x = 1) }
                  ^
+names-defaults-neg.scala:150: warning: type-checking the invocation of method f checks if the named argument expression 'x = ...' is a valid assignment
+in the current scope. The resulting type inference error (see above) can be fixed by providing an explicit type in the local definition for x.
+  class t9 { var x = t.f(x = 1) }
+                           ^
 names-defaults-neg.scala:164: error: variable definition needs type because 'x' is used as a named argument in its body.
   def u3 { var x = u.f(x = 1) }
                ^
@@ -156,5 +164,5 @@ in the current scope. The resulting type inference error (see above) can be fixe
 names-defaults-neg.scala:180: error: reference to x is ambiguous; it is both a method parameter and a variable in scope.
   class u18 { var x: Int = u.f(x = 1) }
                                  ^
-two warnings found
+four warnings found
 41 errors found
diff --git a/test/files/neg/nonlocal-warning.check b/test/files/neg/nonlocal-warning.check
index 67b3b10095..5202df655a 100644
--- a/test/files/neg/nonlocal-warning.check
+++ b/test/files/neg/nonlocal-warning.check
@@ -1,5 +1,4 @@
-nonlocal-warning.scala:4: warning: This catches all Throwables, which often has undesirable consequences.
-If intentional, use `case x : Throwable` to clear this warning.
+nonlocal-warning.scala:4: warning: This catches all Throwables. If this is really intended, use `case x : Throwable` to clear this warning.
     catch { case x => 11 }
                  ^
 nonlocal-warning.scala:2: warning: catch block may intercept non-local return from method foo
diff --git a/test/files/neg/t4851.check b/test/files/neg/t4851.check
index 0fd66b9efe..4f2919807e 100644
--- a/test/files/neg/t4851.check
+++ b/test/files/neg/t4851.check
@@ -40,6 +40,12 @@ S.scala:10: warning: Adapting argument list by inserting (): this is unlikely to
  after adaptation: new J2((): Unit)
   val z2 = new J2()
            ^
+S.scala:14: warning: Adapting argument list by creating a 3-tuple: this may not be what you want.
+        signature: Test.anyId(a: Any): Any
+  given arguments: 1, 2, 3
+ after adaptation: Test.anyId((1, 2, 3): (Int, Int, Int))
+  val w1 = anyId(1, 2 ,3)
+                ^
 error: No warnings can be incurred under -Xfatal-warnings.
-7 warnings found
+8 warnings found
 one error found
diff --git a/test/files/neg/t4851/S.scala b/test/files/neg/t4851/S.scala
index 1550892967..0a442ac7a9 100644
--- a/test/files/neg/t4851/S.scala
+++ b/test/files/neg/t4851/S.scala
@@ -10,6 +10,9 @@ object Test {
   val z2 = new J2()
   val z3 = new J2(())
 
+  def anyId(a: Any) = a
+  val w1 = anyId(1, 2 ,3)
+
   def main(args: Array[String]): Unit = {
     println(x1)
     println(x2)
@@ -19,5 +22,7 @@ object Test {
     println(z1)
     println(z2)
     println(z3)
+
+    println(w1)
   }
 }
diff --git a/test/files/neg/t5753/Impls$class.class b/test/files/neg/t5753/Impls$class.class
deleted file mode 100644
index 476329174e..0000000000
--- a/test/files/neg/t5753/Impls$class.class
+++ /dev/null
diff --git a/test/files/neg/t5753/Impls.class b/test/files/neg/t5753/Impls.class
deleted file mode 100644
index dfcf89ed44..0000000000
--- a/test/files/neg/t5753/Impls.class
+++ /dev/null
diff --git a/test/files/pos/t6942.flags b/test/files/pos/t6942.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/files/pos/t6942.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/t6942/Bar.java b/test/files/pos/t6942/Bar.java
new file mode 100644
index 0000000000..592f62efb4
--- /dev/null
+++ b/test/files/pos/t6942/Bar.java
@@ -0,0 +1,235 @@
+package foo;
+
+public enum Bar {
+    ANGUILLA                    /*("US")*/,
+    ANTIGUA_AND_BARBUDA         /*("US")*/,
+    ARGENTINA                   /*("US")*/,
+    ARUBA                       /*("US")*/,
+    BAHAMAS                     /*("US")*/,
+    BARBADOS                    /*("US")*/,
+    BELIZE                      /*("US")*/,
+    BERMUDA                     /*("US")*/,
+    BOLIVIA                     /*("US")*/,
+    BRAZIL                      /*("US")*/,
+    BRITISH_VIRGIN_ISLANDS      /*("US")*/,
+    CANADA                      /*("US")*/,
+    CAYMAN_ISLANDS              /*("US")*/,
+    CHILE                       /*("US")*/,
+    CHRISTMAS_ISLANDS           /*("US")*/,
+    COCOS                       /*("US")*/,
+    COLOMBIA                    /*("US")*/,
+    COSTA_RICA                  /*("US")*/,
+    CUBA                        /*("US")*/,
+    DOMINICA                    /*("US")*/,
+    DOMINICAN_REPUBLIC          /*("US")*/,
+    ECUADOR                     /*("US")*/,
+    EL_SALVADOR                 /*("US")*/,
+    FALKLAND_ISLANDS            /*("US")*/,
+    GRENADA                     /*("US")*/,
+    GUADALOUPE                  /*("US")*/,
+    GUATEMALA                   /*("US")*/,
+    HAITI                       /*("US")*/,
+    HONDURAS                    /*("US")*/,
+    NETHERLANDS_ANTILLES        /*("US")*/,
+    NICARAGUA                   /*("US")*/,
+    PANAMA                      /*("US")*/,
+    PARAGUAY                    /*("US")*/,
+    PERU                        /*("US")*/,
+    PUERTO_RICO                 /*("US")*/,
+    JAMAICA                     /*("US")*/,
+    MARTINIQUE                  /*("US")*/,
+    MEXICO                      /*("US")*/,
+    MONTSERRAT                  /*("US")*/,
+    ST_KITTS                    /*("US")*/,
+    ST_LUCIA                    /*("US")*/,
+    ST_VINCENT                  /*("US")*/,
+    SUPRA_NATIONAL              /*("US")*/,
+    TRINIDAD                    /*("US")*/,
+    TURKS_AND_CAICOS            /*("US")*/,
+    UNITED_STATES               /*("US")*/,
+    URUGUAY                     /*("US")*/,
+    VENEZUELA                   /*("US")*/,
+    VIRGIN_ISLANDS              /*("US")*/,
+
+    AUSTRALIA                   /*("AP")*/,
+    BANGLADESH                  /*("AP")*/,
+    BHUTAN                      /*("AP")*/,
+    CAMBODIA                    /*("AP")*/,
+    CHINA                       /*("AP")*/,
+    COOK_ISLANDS                /*("AP")*/,
+    EAST_TIMOR                  /*("AP")*/,
+    FIJI                        /*("AP")*/,
+    GUAM                        /*("AP")*/,
+    HONG_KONG                   /*("AP")*/,
+    INDIA                       /*("AP")*/,
+    INDONESIA                   /*("AP")*/,
+    JAPAN                       /*("AP")*/,
+    KIRIBATI                    /*("AP")*/,
+    LAOS                        /*("AP")*/,
+    MACAU                       /*("AP")*/,
+    MALAYSIA                    /*("AP")*/,
+    MICRONESIA                  /*("AP")*/,
+    MONGOLIA                    /*("AP")*/,
+    MYANMAR                     /*("AP")*/,
+    NEPAL                       /*("AP")*/,
+    NEW_CALEDONIA               /*("AP")*/,
+    NEW_ZEALAND                 /*("AP")*/,
+    NORFOLK_ISLAND              /*("AP")*/,
+    NORTH_KOREA                 /*("AP")*/,
+    PAKISTAN                    /*("AP")*/,
+    PALAU                       /*("AP")*/,
+    PAPUA_NEW_GUINEA            /*("AP")*/,
+    PHILIPPINES                 /*("AP")*/,
+    PITCAIRN_ISLANDS            /*("AP")*/,
+    SAMOA                       /*("AP")*/,
+    WEST_SAMOA                  /*("AP")*/,
+    SINGAPORE                   /*("AP")*/,
+    SOUTH_KOREA                 /*("AP")*/,
+    SRI_LANKA                   /*("AP")*/,
+    TAIWAN                      /*("AP")*/,
+    THAILAND                    /*("AP")*/,
+    TOKELAU                     /*("AP")*/,
+    TONGA                       /*("AP")*/,
+    TUVALU                      /*("AP")*/,
+    VANUATU                     /*("AP")*/,
+    VIETNAM                     /*("AP")*/,
+
+    AFGHANISTAN                 /*("EU")*/,
+    ALBANIA                     /*("EU")*/,
+    ALGERIA                     /*("EU")*/,
+    ANDORRA                     /*("EU")*/,
+    ANGOLA                      /*("EU")*/,
+    ARMENIA                     /*("EU")*/,
+    AUSTRIA                     /*("EU")*/,
+    AZERBAIJAN                  /*("EU")*/,
+    BAHRAIN                     /*("EU")*/,
+    BELARUS                     /*("EU")*/,
+    BELGIUM                     /*("EU")*/,
+    BENIN                       /*("EU")*/,
+    BOSNIA_AND_HERZEGOVINA      /*("EU")*/,
+    BOTSWANA                    /*("EU")*/,
+    BOUVET_ISLAND               /*("EU")*/,
+    BRUNEI                      /*("EU")*/,
+    BULGARIA                    /*("EU")*/,
+    BURKINA_FASO                /*("EU")*/,
+    BURUNDI                     /*("EU")*/,
+    CAMEROON                    /*("EU")*/,
+    CAPE_VERDE                  /*("EU")*/,
+    CHAD                        /*("EU")*/,
+    COMOROS                     /*("EU")*/,
+    CONGO                       /*("EU")*/,
+    CROATIA                     /*("EU")*/,
+    CYPRUS                      /*("EU")*/,
+    CZECH_REPUBLIC              /*("EU")*/,
+    DR_CONGO                    /*("EU")*/,
+    DENMARK                     /*("EU")*/,
+    DJIBOUTI                    /*("EU")*/,
+    EGYPT                       /*("EU")*/,
+    EQUATORIAL_GUINEA           /*("EU")*/,
+    ERITREA                     /*("EU")*/,
+    ESTONIA                     /*("EU")*/,
+    ETHIOPIA                    /*("EU")*/,
+    FAEROE_ISLANDS              /*("EU")*/,
+    FINLAND                     /*("EU")*/,
+    FRANCE                      /*("EU")*/,
+    FRENCH_GUIANA               /*("EU")*/,
+    GABON                       /*("EU")*/,
+    GAMBIA                      /*("EU")*/,
+    GEORGIA                     /*("EU")*/,
+    GERMANY                     /*("EU")*/,
+    GHANA                       /*("EU")*/,
+    GIBRALTAR                   /*("EU")*/,
+    GREAT_BRITAIN               /*("EU")*/,
+    GREECE                      /*("EU")*/,
+    GREENLAND                   /*("EU")*/,
+    GUINEA                      /*("EU")*/,
+    GUINEA_BISSAU               /*("EU")*/,
+    GUYANA                      /*("EU")*/,
+    HUNGARY                     /*("EU")*/,
+    ICELAND                     /*("EU")*/,
+    IRAN                        /*("EU")*/,
+    IRAQ                        /*("EU")*/,
+    IRELAND                     /*("EU")*/,
+    ISLE_OF_MAN                 /*("EU")*/,
+    ISRAEL                      /*("EU")*/,
+    ITALY                       /*("EU")*/,
+    IVORY_COAST                 /*("EU")*/,
+    JERSEY                      /*("EU")*/,
+    JORDAN                      /*("EU")*/,
+    KAZAKHSTAN                  /*("EU")*/,
+    KENYA                       /*("EU")*/,
+    KUWAIT                      /*("EU")*/,
+    KYRGYZSTAN                  /*("EU")*/,
+    LATVIA                      /*("EU")*/,
+    LEBANON                     /*("EU")*/,
+    LESOTHO                     /*("EU")*/,
+    LIBERIA                     /*("EU")*/,
+    LIBYA                       /*("EU")*/,
+    LIECHTENSTEIN               /*("EU")*/,
+    LITHUANIA                   /*("EU")*/,
+    LUXEMBOURG                  /*("EU")*/,
+    MACEDONIA                   /*("EU")*/,
+    MADAGASCAR                  /*("EU")*/,
+    MALAWI                      /*("EU")*/,
+    MALDIVES                    /*("EU")*/,
+    MALI                        /*("EU")*/,
+    MALTA                       /*("EU")*/,
+    MARSHALL_ISLAND             /*("EU")*/,
+    MAURITANIA                  /*("EU")*/,
+    MAURITIUS                   /*("EU")*/,
+    MAYOTTE                     /*("EU")*/,
+    MOLDOVA                     /*("EU")*/,
+    MONACO                      /*("EU")*/,
+    MOROCCO                     /*("EU")*/,
+    MOZAMBIQUE                  /*("EU")*/,
+    NAMIBIA                     /*("EU")*/,
+    NETHERLANDS                 /*("EU")*/,
+    NIGER_REPUBLIC              /*("EU")*/,
+    NIGERIA                     /*("EU")*/,
+    NORWAY                      /*("EU")*/,
+    OMAN                        /*("EU")*/,
+    PALESTINE                   /*("EU")*/,
+    POLAND                      /*("EU")*/,
+    PORTUGAL                    /*("EU")*/,
+    QATAR                       /*("EU")*/,
+    REUNION                     /*("EU")*/,
+    ROMANIA                     /*("EU")*/,
+    RUSSIA                      /*("EU")*/,
+    RWANDA                      /*("EU")*/,
+    SAN_MARINO                  /*("EU")*/,
+    SAO_TOME                    /*("EU")*/,
+    SAUDI_ARABIA                /*("EU")*/,
+    SENEGAL                     /*("EU")*/,
+    SERBIA                      /*("EU")*/,
+    SEYCHELLES                  /*("EU")*/,
+    SEIRRA_LEONE                /*("EU")*/,
+    SLOVAKIA                    /*("EU")*/,
+    SLOVENIA                    /*("EU")*/,
+    SOMALIA                     /*("EU")*/,
+    SOUTH_AFRICA                /*("EU")*/,
+    SPAIN                       /*("EU")*/,
+    ST_HELENA                   /*("EU")*/,
+    SUDAN                       /*("EU")*/,
+    SURINAME                    /*("EU")*/,
+    SVALBARD                    /*("EU")*/,
+    SWAZILAND                   /*("EU")*/,
+    SWEDEN                      /*("EU")*/,
+    SWITZERLAND                 /*("EU")*/,
+    SYRIA                       /*("EU")*/,
+    TAJIKSTAN                   /*("EU")*/,
+    TANZANIA                    /*("EU")*/,
+    TOGO                        /*("EU")*/,
+    TUNISIA                     /*("EU")*/,
+    TURKEY                      /*("EU")*/,
+    TURKMENISTAN                /*("EU")*/,
+    UAE                         /*("EU")*/,
+    UGANDA                      /*("EU")*/,
+    UKRAINE                     /*("EU")*/,
+    UZBEKISTAN                  /*("EU")*/,
+    VATICAN_CITY                /*("EU")*/,
+    WESTERN_SAHARA              /*("EU")*/,
+    YEMEN                       /*("EU")*/,
+    ZAMBIA                      /*("EU")*/,
+    ZIMBABWE                    /*("EU")*/;
+
+}
\ No newline at end of file
diff --git a/test/files/pos/t6942/t6942.scala b/test/files/pos/t6942/t6942.scala
new file mode 100644
index 0000000000..77963d2634
--- /dev/null
+++ b/test/files/pos/t6942/t6942.scala
@@ -0,0 +1,64 @@
+// not a peep out of the pattern matcher's unreachability analysis
+// its budget should suffice for these simple matches (they do have a large search space)
+class Test {
+  import foo.Bar // a large enum
+  def exhaustUnreachabilitysStack_ENUM_STYLE = (null: Bar) match {
+    case Bar.BULGARIA =>
+    case _            =>
+  }
+
+  // lots of strings
+  def exhaustUnreachabilitysStack_StringStyle = "foo" match {
+    case "a"          =>
+    case "b"          =>
+    case "c"          =>
+    case "d"          =>
+    case "e"          =>
+    case "f"          =>
+    case "aa"         =>
+    case "ba"         =>
+    case "ca"         =>
+    case "da"         =>
+    case "ea"         =>
+    case "f1a"        =>
+    case "a1a"        =>
+    case "b1a"        =>
+    case "c1a"        =>
+    case "d1a"        =>
+    case "e1a"        =>
+    case "f1a2"       =>
+    case "f1a0"       =>
+    case "a1a2"       =>
+    case "b1a2"       =>
+    case "c1a2"       =>
+    case "d1a2"       =>
+    case "e1a2"       =>
+    case "f1a3"       =>
+    case "_a"         =>
+    case "_b"         =>
+    case "_c"         =>
+    case "_d"         =>
+    case "_e"         =>
+    case "_f"         =>
+    case "_aa"        =>
+    case "_ba"        =>
+    case "_ca"        =>
+    case "_da"        =>
+    case "_ea"        =>
+    case "_f1a"       =>
+    case "_a1a"       =>
+    case "_b1a"       =>
+    case "_c1a"       =>
+    case "_d1a"       =>
+    case "_e1a"       =>
+    case "_f1a0"      =>
+    case "_f1a2"      =>
+    case "_a1a2"      =>
+    case "_b1a2"      =>
+    case "_c1a2"      =>
+    case "_d1a2"      =>
+    case "_e1a2"      =>
+    case "_f1a3"      =>
+    case _            =>
+  }
+}
diff --git a/test/files/pos/t6994.flags b/test/files/pos/t6994.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/files/pos/t6994.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/t6994.scala b/test/files/pos/t6994.scala
new file mode 100644
index 0000000000..d707196423
--- /dev/null
+++ b/test/files/pos/t6994.scala
@@ -0,0 +1,8 @@
+object Test {
+  object NF {
+    def unapply(t: Throwable): Option[Throwable] = None
+  }
+  val x = (try { None } catch { case NF(ex) => None }) getOrElse 0
+  // Was emitting a spurious warning post typer:
+  // "This catches all Throwables. If this is really intended, use `case ex6 : Throwable` to clear this warning."
+}
diff --git a/test/files/run/reify_magicsymbols.check b/test/files/run/reify_magicsymbols.check
index e2aa46a364..c9d892d793 100644
--- a/test/files/run/reify_magicsymbols.check
+++ b/test/files/run/reify_magicsymbols.check
@@ -10,4 +10,4 @@ List[Null]
 List[Nothing]
 AnyRef{def foo(x: Int): Int}
 Int* => Unit
-=> Int => Unit
+(=> Int) => Unit
diff --git a/test/files/run/t5568.check b/test/files/run/t5568.check
new file mode 100644
index 0000000000..67aaf16e07
--- /dev/null
+++ b/test/files/run/t5568.check
@@ -0,0 +1,9 @@
+void
+int
+class scala.runtime.BoxedUnit
+class scala.runtime.BoxedUnit
+class java.lang.Integer
+class java.lang.Integer
+5
+5
+5
diff --git a/test/files/run/t5568.scala b/test/files/run/t5568.scala
new file mode 100644
index 0000000000..14599d9ed2
--- /dev/null
+++ b/test/files/run/t5568.scala
@@ -0,0 +1,16 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    // these should give unboxed results
+    println(().getClass)
+    println(5.getClass)
+  	// these should give boxed results
+    println(().asInstanceOf[AnyRef with Unit].getClass)
+    println(().asInstanceOf[Unit with AnyRef].getClass)
+    println(5.asInstanceOf[AnyRef with Int].getClass)
+    println(5.asInstanceOf[Int with AnyRef].getClass)
+    //make sure ## wasn't broken
+    println(5.##)
+    println((5.asInstanceOf[AnyRef]).##)
+    println((5:Any).##)
+  }
+}
diff --git a/test/files/run/t6434.check b/test/files/run/t6434.check
new file mode 100644
index 0000000000..f898b6b781
--- /dev/null
+++ b/test/files/run/t6434.check
@@ -0,0 +1,10 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> def f(x: => Int): Int = x
+f: (x: => Int)Int
+
+scala> f _
+res0: (=> Int) => Int = <function1>
+
+scala> 
diff --git a/test/files/run/t6434.scala b/test/files/run/t6434.scala
new file mode 100644
index 0000000000..e4a4579613
--- /dev/null
+++ b/test/files/run/t6434.scala
@@ -0,0 +1,8 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  def code =
+"""def f(x: => Int): Int = x
+f _
+"""
+}
diff --git a/test/files/run/t6439.check b/test/files/run/t6439.check
new file mode 100644
index 0000000000..3f5f7dc8a4
--- /dev/null
+++ b/test/files/run/t6439.check
@@ -0,0 +1,77 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> class A
+defined class A
+
+scala> object A // warn
+defined object A
+warning: previously defined class A is not a companion to object A.
+Companions must be defined together; you may wish to use :paste mode for this.
+
+scala> trait B
+defined trait B
+
+scala> object B // warn
+defined object B
+warning: previously defined trait B is not a companion to object B.
+Companions must be defined together; you may wish to use :paste mode for this.
+
+scala> object C
+defined object C
+
+scala> object Bippy
+defined object Bippy
+
+scala> class C // warn
+defined class C
+warning: previously defined object C is not a companion to class C.
+Companions must be defined together; you may wish to use :paste mode for this.
+
+scala> class D
+defined class D
+
+scala> def D = 0 // no warn
+D: Int
+
+scala> val D = 0 // no warn
+D: Int = 0
+
+scala> object E
+defined object E
+
+scala> var E = 0 // no warn
+E: Int = 0
+
+scala> object F
+defined object F
+
+scala> type F = Int // no warn
+defined type alias F
+
+scala> :power
+** Power User mode enabled - BEEP WHIR GYVE **
+** :phase has been set to 'typer'.          **
+** scala.tools.nsc._ has been imported      **
+** global._, definitions._ also imported    **
+** Try  :help, :vals, power.<tab>           **
+
+scala> object lookup {
+  import intp._
+  def apply(name: String): Symbol       = types(name) orElse terms(name)
+  def types(name: String): Symbol       = replScope lookup (name: TypeName) orElse getClassIfDefined(name)
+  def terms(name: String): Symbol       = replScope lookup (name: TermName) orElse getModuleIfDefined(name)
+  def types[T: global.TypeTag] : Symbol = typeOf[T].typeSymbol
+  def terms[T: global.TypeTag] : Symbol = typeOf[T].termSymbol
+  def apply[T: global.TypeTag] : Symbol = typeOf[T].typeSymbol
+}
+defined object lookup
+
+scala> lookup("F") // this now works as a result of changing .typeSymbol to .typeSymbolDirect in IMain#Request#definedSymbols
+res0: $r.intp.global.Symbol = type F
+
+scala> 
+
+scala> 
diff --git a/test/files/run/t6439.scala b/test/files/run/t6439.scala
new file mode 100644
index 0000000000..175a1d134f
--- /dev/null
+++ b/test/files/run/t6439.scala
@@ -0,0 +1,32 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+
+  def code = """
+class A
+object A // warn
+trait B
+object B // warn
+object C
+object Bippy
+class C // warn
+class D
+def D = 0 // no warn
+val D = 0 // no warn
+object E
+var E = 0 // no warn
+object F
+type F = Int // no warn
+:power
+object lookup {
+  import intp._
+  def apply(name: String): Symbol       = types(name) orElse terms(name)
+  def types(name: String): Symbol       = replScope lookup (name: TypeName) orElse getClassIfDefined(name)
+  def terms(name: String): Symbol       = replScope lookup (name: TermName) orElse getModuleIfDefined(name)
+  def types[T: global.TypeTag] : Symbol = typeOf[T].typeSymbol
+  def terms[T: global.TypeTag] : Symbol = typeOf[T].termSymbol
+  def apply[T: global.TypeTag] : Symbol = typeOf[T].typeSymbol
+}
+lookup("F") // this now works as a result of changing .typeSymbol to .typeSymbolDirect in IMain#Request#definedSymbols
+             """
+}
diff --git a/test/files/run/t6956.check b/test/files/run/t6956.check
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/test/files/run/t6956.check
@@ -0,0 +1 @@
+2
diff --git a/test/files/run/t6956.scala b/test/files/run/t6956.scala
new file mode 100644
index 0000000000..4a6583ca45
--- /dev/null
+++ b/test/files/run/t6956.scala
@@ -0,0 +1,26 @@
+import scala.tools.partest.IcodeTest
+
+class Switches {
+  private[this] final val ONE = 1
+
+  def switchBad(i: Byte): Int = i match {
+    case ONE => 1
+    case 2 => 2
+    case 3 => 3
+    case _ => 0
+  }
+
+  def switchOkay(i: Byte): Int = i match {
+    case 1 => 1
+    case 2 => 2
+    case 3 => 3
+    case _ => 0
+  }
+}
+
+object Test extends IcodeTest {
+  // ensure we get two switches out of this -- ignore the rest of the output for robustness
+  // exclude the constant we emit for the "SWITCH ..." string below (we get the icode for all the code you see in this file)
+  override def show() = println(collectIcode("").filter(x => x.indexOf("SWITCH ...") >= 0 && x.indexOf("CONSTANT(") == -1).size)
+}
+