23 files changed, 959 insertions, 505 deletions

diff --git a/test/files/run/classfile-format-51.scala b/test/files/run/classfile-format-51.scala
new file mode 100644
index 0000000000..9b1e612f4f
--- /dev/null
+++ b/test/files/run/classfile-format-51.scala
@@ -0,0 +1,126 @@
+import java.io.{File, FileOutputStream}
+
+import scala.tools.nsc.settings.ScalaVersion
+import scala.tools.partest._
+import scala.tools.asm
+import asm.{AnnotationVisitor, ClassWriter, FieldVisitor, Handle, MethodVisitor, Opcodes}
+import Opcodes._
+
+// This test ensures that we can read JDK 7 (classfile format 51) files, including those
+// with invokeDynamic instructions and associated constant pool entries
+// to do that it first uses ASM to generate a class called DynamicInvoker. Then
+// it runs a normal compile on the source in the 'code' field that refers to
+// DynamicInvoker. Any failure will be dumped to std out.
+//
+// By it's nature the test can only work on JDK 7+ because under JDK 6 some of the
+// classes referred to by DynamicInvoker won't be available and DynamicInvoker won't
+// verify. So the test includes a version check that short-circuites the whole test
+// on JDK 6
+object Test extends DirectTest {
+  override def extraSettings: String = "-optimise -usejavacp -d " + testOutput.path + " -cp " + testOutput.path
+
+  def generateClass() {
+    val invokerClassName =  "DynamicInvoker"
+    val bootstrapMethodName = "bootstrap"
+    val bootStrapMethodType = "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;"
+    val targetMethodName = "target"
+    val targetMethodType = "()Ljava/lang/String;"
+
+    val cw = new ClassWriter(0)
+    cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, invokerClassName, null, "java/lang/Object", null)
+
+    val constructor = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null)
+    constructor.visitCode()
+    constructor.visitVarInsn(ALOAD, 0)
+    constructor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V")
+    constructor.visitInsn(RETURN)
+    constructor.visitMaxs(1, 1)
+    constructor.visitEnd()
+
+    val target = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, targetMethodName, targetMethodType, null, null)
+    target.visitCode()
+    target.visitLdcInsn("hello")
+    target.visitInsn(ARETURN)
+    target.visitMaxs(1, 1)
+    target.visitEnd()
+
+    val bootstrap = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, bootstrapMethodName, bootStrapMethodType, null, null)
+    bootstrap.visitCode()
+//  val lookup = MethodHandles.lookup();
+    bootstrap.visitMethodInsn(INVOKESTATIC, "java/lang/invoke/MethodHandles", "lookup", "()Ljava/lang/invoke/MethodHandles$Lookup;")
+    bootstrap.visitVarInsn(ASTORE, 3) // lookup
+
+//  val clazz = lookup.lookupClass();
+    bootstrap.visitVarInsn(ALOAD, 3) // lookup
+    bootstrap.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandles$Lookup", "lookupClass", "()Ljava/lang/Class;")
+    bootstrap.visitVarInsn(ASTORE, 4) // clazz
+
+// val methodType = MethodType.fromMethodDescriptorString("()Ljava/lang/String, clazz.getClassLoader()")
+    bootstrap.visitLdcInsn("()Ljava/lang/String;")
+    bootstrap.visitVarInsn(ALOAD, 4) // CLAZZ
+    bootstrap.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "getClassLoader", "()Ljava/lang/ClassLoader;")
+    bootstrap.visitMethodInsn(INVOKESTATIC, "java/lang/invoke/MethodType", "fromMethodDescriptorString", "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/invoke/MethodType;")
+    bootstrap.visitVarInsn(ASTORE, 5) // methodType
+
+//  val methodHandle = lookup.findStatic(thisClass, "target", methodType)
+    bootstrap.visitVarInsn(ALOAD, 3) // lookup
+    bootstrap.visitVarInsn(ALOAD, 4) // clazz
+    bootstrap.visitLdcInsn("target")
+    bootstrap.visitVarInsn(ALOAD, 5) // methodType
+    bootstrap.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandles$Lookup", "findStatic", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")
+    bootstrap.visitVarInsn(ASTORE, 6) // methodHandle
+
+//  new ConstantCallSite(methodHandle)
+    bootstrap.visitTypeInsn(NEW, "java/lang/invoke/ConstantCallSite")
+    bootstrap.visitInsn(DUP)
+    bootstrap.visitVarInsn(ALOAD, 6) // methodHandle
+    bootstrap.visitMethodInsn(INVOKESPECIAL, "java/lang/invoke/ConstantCallSite", "<init>", "(Ljava/lang/invoke/MethodHandle;)V")
+    bootstrap.visitInsn(ARETURN)
+    bootstrap.visitMaxs(4,7)
+    bootstrap.visitEnd()
+
+    val test = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "test", s"()Ljava/lang/String;", null, null)
+    test.visitCode()
+    val bootstrapHandle = new Handle(H_INVOKESTATIC, invokerClassName, bootstrapMethodName, bootStrapMethodType)
+    test.visitInvokeDynamicInsn("invoke", targetMethodType, bootstrapHandle)
+    test.visitInsn(ARETURN)
+    test.visitMaxs(1, 1)
+    test.visitEnd()
+
+    cw.visitEnd()
+    val bytes = cw.toByteArray()
+
+    val fos = new FileOutputStream(new File(s"${testOutput.path}/$invokerClassName.class"))
+    try 
+      fos write bytes
+    finally
+      fos.close()
+
+  }
+
+  def code = 
+"""
+object Driver {
+  val invoker = new DynamicInvoker()
+  println(invoker.test())
+}
+"""
+
+  override def show(): Unit = {
+    // redirect err to out, for logging
+    val prevErr = System.err
+    System.setErr(System.out)
+    try {
+      // this test is only valid under JDK 1.7+
+      // cheat a little by using 'ScalaVersion' because it can parse java versions just as well
+      val requiredJavaVersion = ScalaVersion("1.7")
+      val executingJavaVersion = ScalaVersion(System.getProperty("java.specification.version"))
+      if (executingJavaVersion >= requiredJavaVersion) {
+        generateClass()
+        compile()
+      }
+    } 
+    finally
+      System.setErr(prevErr)
+  }
+}
diff --git a/test/files/run/inline-ex-handlers.check b/test/files/run/inline-ex-handlers.check
index abcc8bf42d..7c885d2cc9 100644
--- a/test/files/run/inline-ex-handlers.check
+++ b/test/files/run/inline-ex-handlers.check
@@ -1,427 +1,492 @@
-172c172
-<   locals: value x$1, value x1
----
->   locals: value x$1, value x1, variable boxed1
-174c174
-<   blocks: [1,2,3,4]
----
->   blocks: [1,3,4]
-186a187,188
->     92	STORE_LOCAL(variable boxed1)
->     92	LOAD_LOCAL(variable boxed1)
-195,197d196
-<     92	JUMP 2
-<     
-<   2: 
-247c246
-<   blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,17,18]
----
->   blocks: [1,2,3,4,5,6,8,11,12,13,14,15,16,17,18]
-258,260d256
-<     92	JUMP 7
-<     
-<   7: 
-391c387
-<   locals: value args, variable result, value ex6, value x4, value x5, value message, value x
----
->   locals: value args, variable result, value ex6, value x4, value x5, value x
-393c389
-<   blocks: [1,2,3,4,5,8,10,11,13]
----
->   blocks: [1,2,3,5,8,10,11,13,14]
-417c413,422
-<     103	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 14
->     
->   14: 
->     101	LOAD_LOCAL(value ex6)
->     101	STORE_LOCAL(value x4)
->     101	SCOPE_ENTER value x4
->     106	LOAD_LOCAL(value x4)
->     106	IS_INSTANCE REF(class MyException)
->     106	CZJUMP (BOOL)NE ? 5 : 8
-430,432d434
-<     101	JUMP 4
-<     
-<   4: 
-442,445d443
-<     106	LOAD_LOCAL(value x5)
-<     106	CALL_METHOD MyException.message (dynamic)
-<     106	STORE_LOCAL(value message)
-<     106	SCOPE_ENTER value message
-447c445,446
-<     106	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     106	CALL_METHOD MyException.message (dynamic)
-519c518
-<   blocks: [1,2,3,4,6,7,9,10]
----
->   blocks: [1,3,4,6,7,9,10,11,12,13]
-548c547,552
-<     306	THROW(MyException)
----
->     ?	JUMP 11
->     
->   11: 
->     ?	LOAD_LOCAL(variable monitor4)
->     305	MONITOR_EXIT
->     ?	JUMP 12
-554c558
-<     ?	THROW(Throwable)
----
->     ?	JUMP 12
-560c564,571
-<     ?	THROW(Throwable)
----
->     ?	STORE_LOCAL(value t)
->     ?	JUMP 13
->     
->   12: 
->     ?	LOAD_LOCAL(variable monitor3)
->     304	MONITOR_EXIT
->     ?	STORE_LOCAL(value t)
->     ?	JUMP 13
-574c585
-<     310	JUMP 2
----
->     300	RETURN(UNIT)
-576c587,596
-<   2: 
----
->   13: 
->     310	LOAD_MODULE object Predef
->     310	CALL_PRIMITIVE(StartConcat)
->     310	CONSTANT("Caught crash: ")
->     310	CALL_PRIMITIVE(StringConcat(REF(class String)))
->     310	LOAD_LOCAL(value t)
->     310	CALL_METHOD java.lang.Throwable.toString (dynamic)
->     310	CALL_PRIMITIVE(StringConcat(REF(class String)))
->     310	CALL_PRIMITIVE(EndConcat)
->     310	CALL_METHOD scala.Predef.println (dynamic)
-584c604
-<     catch (Throwable) in ArrayBuffer(7, 9, 10) starting at: 6
----
->     catch (Throwable) in ArrayBuffer(7, 9, 10, 11) starting at: 6
-587c607
-<     catch (Throwable) in ArrayBuffer(4, 6, 7, 9, 10) starting at: 3
----
->     catch (Throwable) in ArrayBuffer(4, 6, 7, 9, 10, 11, 12) starting at: 3
-619c639
-<   blocks: [1,3,4,5,6,8,9]
----
->   blocks: [1,3,4,5,6,8,9,10,11]
-643c663,669
-<     78	THROW(IllegalArgumentException)
----
->     ?	STORE_LOCAL(value e)
->     ?	JUMP 10
->     
->   10: 
->     81	LOAD_LOCAL(value e)
->     ?	STORE_LOCAL(variable exc1)
->     ?	JUMP 11
-669c695,696
-<     81	THROW(Exception)
----
->     ?	STORE_LOCAL(variable exc1)
->     ?	JUMP 11
-685a713,725
->   11: 
->     83	LOAD_MODULE object Predef
->     83	CONSTANT("finally")
->     83	CALL_METHOD scala.Predef.println (dynamic)
->     84	LOAD_LOCAL(variable result)
->     84	CONSTANT(1)
->     84	CALL_PRIMITIVE(Arithmetic(SUB,INT))
->     84	CONSTANT(2)
->     84	CALL_PRIMITIVE(Arithmetic(DIV,INT))
->     84	STORE_LOCAL(variable result)
->     84	LOAD_LOCAL(variable exc1)
->     84	THROW(Throwable)
->     
-691c731
-<     catch (<none>) in ArrayBuffer(4, 5, 6, 8) starting at: 3
----
->     catch (<none>) in ArrayBuffer(4, 5, 6, 8, 10) starting at: 3
-715c755
-<   locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value message, value x, value ex6, value x4, value x5, value message, value x
----
->   locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value x, value ex6, value x4, value x5, value x
-717c757
-<   blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24]
----
->   blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24,25,26,27]
-741c781,788
-<     172	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 25
->     
->   25: 
->     170	LOAD_LOCAL(value ex6)
->     170	STORE_LOCAL(value x4)
->     170	SCOPE_ENTER value x4
->     170	JUMP 14
-781,784d827
-<     175	LOAD_LOCAL(value x5)
-<     175	CALL_METHOD MyException.message (dynamic)
-<     175	STORE_LOCAL(value message)
-<     175	SCOPE_ENTER value message
-786c829,830
-<     176	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     176	CALL_METHOD MyException.message (dynamic)
-790c834,835
-<     177	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     177	CALL_METHOD MyException.message (dynamic)
-792c837,838
-<     177	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 26
-796c842,843
-<     170	THROW(Throwable)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 26
-805a853,858
->   26: 
->     169	LOAD_LOCAL(value ex6)
->     169	STORE_LOCAL(value x4)
->     169	SCOPE_ENTER value x4
->     169	JUMP 5
->     
-816,819d868
-<     180	LOAD_LOCAL(value x5)
-<     180	CALL_METHOD MyException.message (dynamic)
-<     180	STORE_LOCAL(value message)
-<     180	SCOPE_ENTER value message
-821c870,871
-<     181	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     181	CALL_METHOD MyException.message (dynamic)
-825c875,876
-<     182	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     182	CALL_METHOD MyException.message (dynamic)
-827c878,879
-<     182	THROW(MyException)
----
->     ?	STORE_LOCAL(variable exc2)
->     ?	JUMP 27
-831c883,884
-<     169	THROW(Throwable)
----
->     ?	STORE_LOCAL(variable exc2)
->     ?	JUMP 27
-847a901,913
->   27: 
->     184	LOAD_MODULE object Predef
->     184	CONSTANT("finally")
->     184	CALL_METHOD scala.Predef.println (dynamic)
->     185	LOAD_LOCAL(variable result)
->     185	CONSTANT(1)
->     185	CALL_PRIMITIVE(Arithmetic(SUB,INT))
->     185	CONSTANT(2)
->     185	CALL_PRIMITIVE(Arithmetic(DIV,INT))
->     185	STORE_LOCAL(variable result)
->     185	LOAD_LOCAL(variable exc2)
->     185	THROW(Throwable)
->     
-853c919
-<     catch (Throwable) in ArrayBuffer(13, 14, 15, 18, 20, 21, 23) starting at: 4
----
->     catch (Throwable) in ArrayBuffer(13, 14, 15, 18, 20, 21, 23, 25) starting at: 4
-856c922
-<     catch (<none>) in ArrayBuffer(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23) starting at: 3
----
->     catch (<none>) in ArrayBuffer(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23, 25, 26) starting at: 3
-880c946
-<   locals: value args, variable result, value e, value ex6, value x4, value x5, value message, value x
----
->   locals: value args, variable result, value e, value ex6, value x4, value x5, value x
-882c948
-<   blocks: [1,2,3,6,7,8,11,13,14,16]
----
->   blocks: [1,2,3,6,7,8,11,13,14,16,17]
-906c972,979
-<     124	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 17
->     
->   17: 
->     122	LOAD_LOCAL(value ex6)
->     122	STORE_LOCAL(value x4)
->     122	SCOPE_ENTER value x4
->     122	JUMP 7
-931,934d1003
-<     127	LOAD_LOCAL(value x5)
-<     127	CALL_METHOD MyException.message (dynamic)
-<     127	STORE_LOCAL(value message)
-<     127	SCOPE_ENTER value message
-936c1005,1006
-<     127	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     127	CALL_METHOD MyException.message (dynamic)
-965c1035
-<     catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 11, 13, 14, 16) starting at: 3
----
->     catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 11, 13, 14, 16, 17) starting at: 3
-989c1059
-<   locals: value args, variable result, value ex6, value x4, value x5, value message, value x, value e
----
->   locals: value args, variable result, value ex6, value x4, value x5, value x, value e
-991c1061
-<   blocks: [1,2,3,4,5,8,12,13,14,16]
----
->   blocks: [1,2,3,5,8,12,13,14,16,17]
-1015c1085,1094
-<     148	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 17
->     
->   17: 
->     145	LOAD_LOCAL(value ex6)
->     145	STORE_LOCAL(value x4)
->     145	SCOPE_ENTER value x4
->     154	LOAD_LOCAL(value x4)
->     154	IS_INSTANCE REF(class MyException)
->     154	CZJUMP (BOOL)NE ? 5 : 8
-1036,1038d1114
-<     145	JUMP 4
-<     
-<   4: 
-1048,1051d1123
-<     154	LOAD_LOCAL(value x5)
-<     154	CALL_METHOD MyException.message (dynamic)
-<     154	STORE_LOCAL(value message)
-<     154	SCOPE_ENTER value message
-1053c1125,1126
-<     154	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     154	CALL_METHOD MyException.message (dynamic)
-1270c1343
-<   blocks: [1,2,3,4,5,7]
----
->   blocks: [1,2,3,4,5,7,8]
-1294c1367,1374
-<     38	THROW(IllegalArgumentException)
----
->     ?	STORE_LOCAL(value e)
->     ?	JUMP 8
->     
->   8: 
->     42	LOAD_MODULE object Predef
->     42	CONSTANT("IllegalArgumentException")
->     42	CALL_METHOD scala.Predef.println (dynamic)
->     42	JUMP 2
-1341c1421
-<   locals: value args, variable result, value ex6, value x4, value x5, value message, value x
----
->   locals: value args, variable result, value ex6, value x4, value x5, value x
-1343c1423
-<   blocks: [1,2,3,4,5,8,10,11,13,14,16]
----
->   blocks: [1,2,3,5,8,10,11,13,14,16,17]
-1367c1447,1448
-<     203	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 17
-1387c1468,1477
-<     209	THROW(MyException)
----
->     ?	STORE_LOCAL(value ex6)
->     ?	JUMP 17
->     
->   17: 
->     200	LOAD_LOCAL(value ex6)
->     200	STORE_LOCAL(value x4)
->     200	SCOPE_ENTER value x4
->     212	LOAD_LOCAL(value x4)
->     212	IS_INSTANCE REF(class MyException)
->     212	CZJUMP (BOOL)NE ? 5 : 8
-1400,1402d1489
-<     200	JUMP 4
-<     
-<   4: 
-1412,1415d1498
-<     212	LOAD_LOCAL(value x5)
-<     212	CALL_METHOD MyException.message (dynamic)
-<     212	STORE_LOCAL(value message)
-<     212	SCOPE_ENTER value message
-1417c1500,1501
-<     213	LOAD_LOCAL(value message)
----
->     ?	LOAD_LOCAL(value x5)
->     213	CALL_METHOD MyException.message (dynamic)
-1461c1545
-<   blocks: [1,2,3,4,5,7]
----
->   blocks: [1,2,3,4,5,7,8]
-1485c1569,1570
-<     58	THROW(IllegalArgumentException)
----
->     ?	STORE_LOCAL(value e)
->     ?	JUMP 8
-1486a1572,1577
->   8: 
->     62	LOAD_MODULE object Predef
->     62	CONSTANT("RuntimeException")
->     62	CALL_METHOD scala.Predef.println (dynamic)
->     62	JUMP 2
->     
-1534c1625
-<   blocks: [1,3,4]
----
->   blocks: [1,3,4,5]
-1554c1645,1650
-<     229	THROW(MyException)
----
->     ?	JUMP 5
->     
->   5: 
->     ?	LOAD_LOCAL(variable monitor1)
->     228	MONITOR_EXIT
->     228	THROW(Throwable)
-1560c1656
-<     ?	THROW(Throwable)
----
->     228	THROW(Throwable)
-1588c1684
-<   locals: value args, variable result, variable monitor2, variable monitorResult1
----
->   locals: value exception$1, value args, variable result, variable monitor2, variable monitorResult1
-1590c1686
-<   blocks: [1,3,4]
----
->   blocks: [1,3,4,5]
-1613c1709,1717
-<     245	THROW(MyException)
----
->     ?	STORE_LOCAL(value exception$1)
->     ?	DROP ConcatClass
->     ?	LOAD_LOCAL(value exception$1)
->     ?	JUMP 5
->     
->   5: 
->     ?	LOAD_LOCAL(variable monitor2)
->     244	MONITOR_EXIT
->     244	THROW(Throwable)
-1619c1723
-<     ?	THROW(Throwable)
----
->     244	THROW(Throwable)
-
+--- a
++++ b
+@@ -171,5 +171,5 @@
+   def productElement(x$1: Int (INT)): Object {
+-  locals: value x$1, value x1
++  locals: value x$1, value x1, variable boxed1
+   startBlock: 1
+-  blocks: [1,2,3,4]
++  blocks: [1,3,4]
+   
+@@ -186,2 +186,4 @@
+     92	LOAD_LOCAL(value x$1)
++    92	STORE_LOCAL(variable boxed1)
++    92	LOAD_LOCAL(variable boxed1)
+     92	BOX INT
+@@ -194,5 +196,2 @@
+     92	CALL_METHOD MyException.message (dynamic)
+-    92	JUMP 2
+-    
+-  2: 
+     92	RETURN(REF(class Object))
+@@ -246,3 +245,3 @@
+   startBlock: 1
+-  blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,17,18]
++  blocks: [1,2,3,4,5,6,8,11,12,13,14,15,16,17,18]
+   
+@@ -257,5 +256,2 @@
+     92	SCOPE_ENTER value x1
+-    92	JUMP 7
+-    
+-  7: 
+     92	LOAD_LOCAL(value x1)
+@@ -390,5 +386,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, value ex6, value x4, value x5, value message, value x
++  locals: value args, variable result, value ex6, value x4, value x5, value x
+   startBlock: 1
+-  blocks: [1,2,3,4,5,8,10,11,13]
++  blocks: [1,2,3,5,8,10,11,13,14]
+   
+@@ -416,4 +412,13 @@
+     103	CALL_METHOD MyException.<init> (static-instance)
+-    103	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 14
+     
++  14: 
++    101	LOAD_LOCAL(value ex6)
++    101	STORE_LOCAL(value x4)
++    101	SCOPE_ENTER value x4
++    106	LOAD_LOCAL(value x4)
++    106	IS_INSTANCE REF(class MyException)
++    106	CZJUMP (BOOL)NE ? 5 : 8
++    
+   13: 
+@@ -429,5 +434,2 @@
+     101	SCOPE_ENTER value x4
+-    101	JUMP 4
+-    
+-  4: 
+     106	LOAD_LOCAL(value x4)
+@@ -441,8 +443,5 @@
+     106	SCOPE_ENTER value x5
+-    106	LOAD_LOCAL(value x5)
+-    106	CALL_METHOD MyException.message (dynamic)
+-    106	STORE_LOCAL(value message)
+-    106	SCOPE_ENTER value message
+     106	LOAD_MODULE object Predef
+-    106	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    106	CALL_METHOD MyException.message (dynamic)
+     106	CALL_METHOD scala.Predef.println (dynamic)
+@@ -518,3 +517,3 @@
+   startBlock: 1
+-  blocks: [1,2,3,4,6,7,9,10]
++  blocks: [1,3,4,6,7,9,10,11,12,13]
+   
+@@ -547,4 +546,9 @@
+     306	CALL_METHOD MyException.<init> (static-instance)
+-    306	THROW(MyException)
++    ?	JUMP 11
+     
++  11: 
++    ?	LOAD_LOCAL(variable monitor4)
++    305	MONITOR_EXIT
++    ?	JUMP 12
++    
+   9: 
+@@ -553,3 +557,3 @@
+     305	MONITOR_EXIT
+-    ?	THROW(Throwable)
++    ?	JUMP 12
+     
+@@ -559,4 +563,11 @@
+     304	MONITOR_EXIT
+-    ?	THROW(Throwable)
++    ?	STORE_LOCAL(value t)
++    ?	JUMP 13
+     
++  12: 
++    ?	LOAD_LOCAL(variable monitor3)
++    304	MONITOR_EXIT
++    ?	STORE_LOCAL(value t)
++    ?	JUMP 13
++    
+   3: 
+@@ -573,5 +584,14 @@
+     310	CALL_METHOD scala.Predef.println (dynamic)
+-    310	JUMP 2
++    300	RETURN(UNIT)
+     
+-  2: 
++  13: 
++    310	LOAD_MODULE object Predef
++    310	CALL_PRIMITIVE(StartConcat)
++    310	CONSTANT("Caught crash: ")
++    310	CALL_PRIMITIVE(StringConcat(REF(class String)))
++    310	LOAD_LOCAL(value t)
++    310	CALL_METHOD java.lang.Throwable.toString (dynamic)
++    310	CALL_PRIMITIVE(StringConcat(REF(class String)))
++    310	CALL_PRIMITIVE(EndConcat)
++    310	CALL_METHOD scala.Predef.println (dynamic)
+     300	RETURN(UNIT)
+@@ -583,6 +603,6 @@
+       with finalizer: null
+-    catch (Throwable) in ArrayBuffer(7, 9, 10) starting at: 6
++    catch (Throwable) in ArrayBuffer(7, 9, 10, 11) starting at: 6
+       consisting of blocks: List(6)
+       with finalizer: null
+-    catch (Throwable) in ArrayBuffer(4, 6, 7, 9, 10) starting at: 3
++    catch (Throwable) in ArrayBuffer(4, 6, 7, 9, 10, 11, 12) starting at: 3
+       consisting of blocks: List(3)
+@@ -618,3 +638,3 @@
+   startBlock: 1
+-  blocks: [1,3,4,5,6,8,9]
++  blocks: [1,3,4,5,6,8,9,10,11]
+   
+@@ -642,4 +662,10 @@
+     78	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
+-    78	THROW(IllegalArgumentException)
++    ?	STORE_LOCAL(value e)
++    ?	JUMP 10
+     
++  10: 
++    81	LOAD_LOCAL(value e)
++    ?	STORE_LOCAL(variable exc1)
++    ?	JUMP 11
++    
+   8: 
+@@ -668,3 +694,4 @@
+     81	LOAD_LOCAL(value e)
+-    81	THROW(Exception)
++    ?	STORE_LOCAL(variable exc1)
++    ?	JUMP 11
+     
+@@ -685,2 +712,15 @@
+     
++  11: 
++    83	LOAD_MODULE object Predef
++    83	CONSTANT("finally")
++    83	CALL_METHOD scala.Predef.println (dynamic)
++    84	LOAD_LOCAL(variable result)
++    84	CONSTANT(1)
++    84	CALL_PRIMITIVE(Arithmetic(SUB,INT))
++    84	CONSTANT(2)
++    84	CALL_PRIMITIVE(Arithmetic(DIV,INT))
++    84	STORE_LOCAL(variable result)
++    84	LOAD_LOCAL(variable exc1)
++    84	THROW(Throwable)
++    
+   }
+@@ -690,3 +730,3 @@
+       with finalizer: null
+-    catch (<none>) in ArrayBuffer(4, 5, 6, 8) starting at: 3
++    catch (<none>) in ArrayBuffer(4, 5, 6, 8, 10) starting at: 3
+       consisting of blocks: List(3)
+@@ -714,5 +754,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value message, value x, value ex6, value x4, value x5, value message, value x
++  locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value x, value ex6, value x4, value x5, value x
+   startBlock: 1
+-  blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24]
++  blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24,25,26,27]
+   
+@@ -740,4 +780,11 @@
+     172	CALL_METHOD MyException.<init> (static-instance)
+-    172	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 25
+     
++  25: 
++    170	LOAD_LOCAL(value ex6)
++    170	STORE_LOCAL(value x4)
++    170	SCOPE_ENTER value x4
++    170	JUMP 14
++    
+   23: 
+@@ -780,8 +827,5 @@
+     175	SCOPE_ENTER value x5
+-    175	LOAD_LOCAL(value x5)
+-    175	CALL_METHOD MyException.message (dynamic)
+-    175	STORE_LOCAL(value message)
+-    175	SCOPE_ENTER value message
+     176	LOAD_MODULE object Predef
+-    176	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    176	CALL_METHOD MyException.message (dynamic)
+     176	CALL_METHOD scala.Predef.println (dynamic)
+@@ -789,5 +833,7 @@
+     177	DUP(REF(class MyException))
+-    177	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    177	CALL_METHOD MyException.message (dynamic)
+     177	CALL_METHOD MyException.<init> (static-instance)
+-    177	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 26
+     
+@@ -795,3 +841,4 @@
+     170	LOAD_LOCAL(value ex6)
+-    170	THROW(Throwable)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 26
+     
+@@ -805,2 +852,8 @@
+     
++  26: 
++    169	LOAD_LOCAL(value ex6)
++    169	STORE_LOCAL(value x4)
++    169	SCOPE_ENTER value x4
++    169	JUMP 5
++    
+   5: 
+@@ -815,8 +868,5 @@
+     180	SCOPE_ENTER value x5
+-    180	LOAD_LOCAL(value x5)
+-    180	CALL_METHOD MyException.message (dynamic)
+-    180	STORE_LOCAL(value message)
+-    180	SCOPE_ENTER value message
+     181	LOAD_MODULE object Predef
+-    181	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    181	CALL_METHOD MyException.message (dynamic)
+     181	CALL_METHOD scala.Predef.println (dynamic)
+@@ -824,5 +874,7 @@
+     182	DUP(REF(class MyException))
+-    182	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    182	CALL_METHOD MyException.message (dynamic)
+     182	CALL_METHOD MyException.<init> (static-instance)
+-    182	THROW(MyException)
++    ?	STORE_LOCAL(variable exc2)
++    ?	JUMP 27
+     
+@@ -830,3 +882,4 @@
+     169	LOAD_LOCAL(value ex6)
+-    169	THROW(Throwable)
++    ?	STORE_LOCAL(variable exc2)
++    ?	JUMP 27
+     
+@@ -847,2 +900,15 @@
+     
++  27: 
++    184	LOAD_MODULE object Predef
++    184	CONSTANT("finally")
++    184	CALL_METHOD scala.Predef.println (dynamic)
++    185	LOAD_LOCAL(variable result)
++    185	CONSTANT(1)
++    185	CALL_PRIMITIVE(Arithmetic(SUB,INT))
++    185	CONSTANT(2)
++    185	CALL_PRIMITIVE(Arithmetic(DIV,INT))
++    185	STORE_LOCAL(variable result)
++    185	LOAD_LOCAL(variable exc2)
++    185	THROW(Throwable)
++    
+   }
+@@ -852,6 +918,6 @@
+       with finalizer: null
+-    catch (Throwable) in ArrayBuffer(13, 14, 15, 18, 20, 21, 23) starting at: 4
++    catch (Throwable) in ArrayBuffer(13, 14, 15, 18, 20, 21, 23, 25) starting at: 4
+       consisting of blocks: List(9, 8, 6, 5, 4)
+       with finalizer: null
+-    catch (<none>) in ArrayBuffer(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23) starting at: 3
++    catch (<none>) in ArrayBuffer(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23, 25, 26) starting at: 3
+       consisting of blocks: List(3)
+@@ -879,5 +945,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, value e, value ex6, value x4, value x5, value message, value x
++  locals: value args, variable result, value e, value ex6, value x4, value x5, value x
+   startBlock: 1
+-  blocks: [1,2,3,6,7,8,11,13,14,16]
++  blocks: [1,2,3,6,7,8,11,13,14,16,17]
+   
+@@ -905,4 +971,11 @@
+     124	CALL_METHOD MyException.<init> (static-instance)
+-    124	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 17
+     
++  17: 
++    122	LOAD_LOCAL(value ex6)
++    122	STORE_LOCAL(value x4)
++    122	SCOPE_ENTER value x4
++    122	JUMP 7
++    
+   16: 
+@@ -930,8 +1003,5 @@
+     127	SCOPE_ENTER value x5
+-    127	LOAD_LOCAL(value x5)
+-    127	CALL_METHOD MyException.message (dynamic)
+-    127	STORE_LOCAL(value message)
+-    127	SCOPE_ENTER value message
+     127	LOAD_MODULE object Predef
+-    127	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    127	CALL_METHOD MyException.message (dynamic)
+     127	CALL_METHOD scala.Predef.println (dynamic)
+@@ -964,3 +1034,3 @@
+       with finalizer: null
+-    catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 11, 13, 14, 16) starting at: 3
++    catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 11, 13, 14, 16, 17) starting at: 3
+       consisting of blocks: List(3)
+@@ -988,5 +1058,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, value ex6, value x4, value x5, value message, value x, value e
++  locals: value args, variable result, value ex6, value x4, value x5, value x, value e
+   startBlock: 1
+-  blocks: [1,2,3,4,5,8,12,13,14,16]
++  blocks: [1,2,3,5,8,12,13,14,16,17]
+   
+@@ -1014,4 +1084,13 @@
+     148	CALL_METHOD MyException.<init> (static-instance)
+-    148	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 17
+     
++  17: 
++    145	LOAD_LOCAL(value ex6)
++    145	STORE_LOCAL(value x4)
++    145	SCOPE_ENTER value x4
++    154	LOAD_LOCAL(value x4)
++    154	IS_INSTANCE REF(class MyException)
++    154	CZJUMP (BOOL)NE ? 5 : 8
++    
+   16: 
+@@ -1035,5 +1114,2 @@
+     145	SCOPE_ENTER value x4
+-    145	JUMP 4
+-    
+-  4: 
+     154	LOAD_LOCAL(value x4)
+@@ -1047,8 +1123,5 @@
+     154	SCOPE_ENTER value x5
+-    154	LOAD_LOCAL(value x5)
+-    154	CALL_METHOD MyException.message (dynamic)
+-    154	STORE_LOCAL(value message)
+-    154	SCOPE_ENTER value message
+     154	LOAD_MODULE object Predef
+-    154	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    154	CALL_METHOD MyException.message (dynamic)
+     154	CALL_METHOD scala.Predef.println (dynamic)
+@@ -1269,3 +1342,3 @@
+   startBlock: 1
+-  blocks: [1,2,3,4,5,7]
++  blocks: [1,2,3,4,5,7,8]
+   
+@@ -1293,4 +1366,11 @@
+     38	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
+-    38	THROW(IllegalArgumentException)
++    ?	STORE_LOCAL(value e)
++    ?	JUMP 8
+     
++  8: 
++    42	LOAD_MODULE object Predef
++    42	CONSTANT("IllegalArgumentException")
++    42	CALL_METHOD scala.Predef.println (dynamic)
++    42	JUMP 2
++    
+   7: 
+@@ -1340,5 +1420,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, value ex6, value x4, value x5, value message, value x
++  locals: value args, variable result, value ex6, value x4, value x5, value x
+   startBlock: 1
+-  blocks: [1,2,3,4,5,8,10,11,13,14,16]
++  blocks: [1,2,3,5,8,10,11,13,14,16,17]
+   
+@@ -1366,3 +1446,4 @@
+     203	CALL_METHOD MyException.<init> (static-instance)
+-    203	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 17
+     
+@@ -1386,4 +1467,13 @@
+     209	CALL_METHOD MyException.<init> (static-instance)
+-    209	THROW(MyException)
++    ?	STORE_LOCAL(value ex6)
++    ?	JUMP 17
+     
++  17: 
++    200	LOAD_LOCAL(value ex6)
++    200	STORE_LOCAL(value x4)
++    200	SCOPE_ENTER value x4
++    212	LOAD_LOCAL(value x4)
++    212	IS_INSTANCE REF(class MyException)
++    212	CZJUMP (BOOL)NE ? 5 : 8
++    
+   16: 
+@@ -1399,5 +1489,2 @@
+     200	SCOPE_ENTER value x4
+-    200	JUMP 4
+-    
+-  4: 
+     212	LOAD_LOCAL(value x4)
+@@ -1411,8 +1498,5 @@
+     212	SCOPE_ENTER value x5
+-    212	LOAD_LOCAL(value x5)
+-    212	CALL_METHOD MyException.message (dynamic)
+-    212	STORE_LOCAL(value message)
+-    212	SCOPE_ENTER value message
+     213	LOAD_MODULE object Predef
+-    213	LOAD_LOCAL(value message)
++    ?	LOAD_LOCAL(value x5)
++    213	CALL_METHOD MyException.message (dynamic)
+     213	CALL_METHOD scala.Predef.println (dynamic)
+@@ -1460,3 +1544,3 @@
+   startBlock: 1
+-  blocks: [1,2,3,4,5,7]
++  blocks: [1,2,3,4,5,7,8]
+   
+@@ -1484,4 +1568,11 @@
+     58	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
+-    58	THROW(IllegalArgumentException)
++    ?	STORE_LOCAL(value e)
++    ?	JUMP 8
+     
++  8: 
++    62	LOAD_MODULE object Predef
++    62	CONSTANT("RuntimeException")
++    62	CALL_METHOD scala.Predef.println (dynamic)
++    62	JUMP 2
++    
+   7: 
+@@ -1533,3 +1624,3 @@
+   startBlock: 1
+-  blocks: [1,3,4]
++  blocks: [1,3,4,5]
+   
+@@ -1553,4 +1644,9 @@
+     229	CALL_METHOD MyException.<init> (static-instance)
+-    229	THROW(MyException)
++    ?	JUMP 5
+     
++  5: 
++    ?	LOAD_LOCAL(variable monitor1)
++    228	MONITOR_EXIT
++    228	THROW(Throwable)
++    
+   3: 
+@@ -1559,3 +1655,3 @@
+     228	MONITOR_EXIT
+-    ?	THROW(Throwable)
++    228	THROW(Throwable)
+     
+@@ -1587,5 +1683,5 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, variable result, variable monitor2, variable monitorResult1
++  locals: value exception$1, value args, variable result, variable monitor2, variable monitorResult1
+   startBlock: 1
+-  blocks: [1,3,4]
++  blocks: [1,3,4,5]
+   
+@@ -1612,4 +1708,12 @@
+     245	CALL_METHOD MyException.<init> (static-instance)
+-    245	THROW(MyException)
++    ?	STORE_LOCAL(value exception$1)
++    ?	DROP ConcatClass
++    ?	LOAD_LOCAL(value exception$1)
++    ?	JUMP 5
+     
++  5: 
++    ?	LOAD_LOCAL(variable monitor2)
++    244	MONITOR_EXIT
++    244	THROW(Throwable)
++    
+   3: 
+@@ -1618,3 +1722,3 @@
+     244	MONITOR_EXIT
+-    ?	THROW(Throwable)
++    244	THROW(Throwable)
+     
diff --git a/test/files/run/outertest.scala b/test/files/run/outertest.scala
index 3cc96afa5b..fa0443f669 100644
--- a/test/files/run/outertest.scala
+++ b/test/files/run/outertest.scala
@@ -1,26 +1,57 @@
 // A test for the case where the outer field of class B#J should be eliminated.
-// You can verify this by running a javap on B.J
+
+import reflect.ClassTag
+
 abstract class A {
+  abstract class I
 
-  abstract class I {
+  val foo = this
+}
 
+class B extends A {
+  class J extends I {
+    val bar = foo
   }
 
-  val foo = "foo"
+  type II = I
+  class K extends II {
+    val bar = foo
+  }
 
+  class L extends (I @annotation.tailrec) {
+    val bar = foo
+  }
 }
 
-class B extends A {
 
-  class J extends I {
+class C extends A {
+  val c: C = this
+
+  class M extends c.I {
     val bar = foo
   }
-
 }
 
-object  Test extends App {
 
+object Test extends App {
   val b = new B
-  assert((new b.J).bar == b.foo)
+  val c0 = new C
+  val c = new { override val c = c0 } with C
+
+  assert((new b.J).bar eq b)
+  assert((new b.K).bar eq b)
+  assert((new b.L).bar eq b)
+  assert((new c.M).bar eq c)
+
+  def checkOuterFields[C: ClassTag](expected: Int) {
+    val cls = implicitly[ClassTag[C]].runtimeClass
+    val outerFields = cls.getDeclaredFields().filter(_.getName.contains("$outer"))
+    assert(outerFields.size == expected, outerFields.map(_.getName))
+  }
 
+  checkOuterFields[A#I](1) // the base class must have the $outer pointer
+  checkOuterFields[B#J](0) // reuse parent class' $outer pointer
+  checkOuterFields[B#K](0) // ... through an alias
+  checkOuterFields[B#L](0) // ... through the annotated type
+  checkOuterFields[C#M](1) // different prefix, can't share.
 }
diff --git a/test/files/run/t3994.scala b/test/files/run/t3994.scala
new file mode 100644
index 0000000000..0ee1d9d966
--- /dev/null
+++ b/test/files/run/t3994.scala
@@ -0,0 +1,20 @@
+trait T {
+  trait Default { def foo = this }
+  object Default extends Default
+}
+
+class Crash { // if you change this to a `trait` it keeps failing, though if it is an `object` it compiles just fine!
+  class Element
+
+  /* declare this as a class, and the crash goes away */
+  trait ElementOrdering extends Ordering[Element] {
+    def compare(a: Element, b: Element): Int = 0
+  }
+
+  implicit object ElementOrdering extends ElementOrdering
+}
+
+object Test extends App {
+  (new T {}).Default
+  (new Crash).ElementOrdering
+}
diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check
new file mode 100755
index 0000000000..df19644ae6
--- /dev/null
+++ b/test/files/run/t5699.check
@@ -0,0 +1,11 @@
+[[syntax trees at end of                    parser]] // annodef.java
+package <empty> {
+  object MyAnnotation extends  {
+    def <init>() = _
+  };
+  class MyAnnotation extends scala.annotation.Annotation with _root_.java.lang.annotation.Annotation with scala.annotation.ClassfileAnnotation {
+    def <init>() = _;
+    def value(): String
+  }
+}
+
diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala
new file mode 100755
index 0000000000..5cef67e3b1
--- /dev/null
+++ b/test/files/run/t5699.scala
@@ -0,0 +1,24 @@
+import scala.tools.partest.DirectTest
+import scala.tools.nsc.util.BatchSourceFile
+
+object Test extends DirectTest {
+  // Java code
+  override def code = """
+    |public @interface MyAnnotation { String value(); }
+  """.stripMargin
+
+  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Xprint:parser"
+
+  override def show(): Unit = {
+    // redirect err to out, for logging
+    val prevErr = System.err
+    System.setErr(System.out)
+    compile()
+    System.setErr(prevErr)
+  }
+
+  override def newSources(sourceCodes: String*) = {
+    assert(sourceCodes.size == 1)
+    List(new BatchSourceFile("annodef.java", sourceCodes(0)))
+  }
+}
diff --git a/test/files/run/t6146b.check b/test/files/run/t6146b.check
index b664d1152a..49ff70697e 100644
--- a/test/files/run/t6146b.check
+++ b/test/files/run/t6146b.check
@@ -37,8 +37,15 @@ memType: (sub: u.Type, scrut: u.Type)u.Type
 
 scala> 
 
-scala> memType(S1, fTpe)
-res0: u.Type = O.X.S1.type
+scala> val mt1 = memType(S1, fTpe)
+mt1: u.Type = O.X.S1.type
+
+scala> global.typeDeconstruct.show(mt1)
+res0: String = 
+TypeRef(
+  pre = SingleType(pre = ThisType(object O), object X)
+  TypeSymbol(class S1 extends C.this.F[T])
+)
 
 scala> memType(S2, fTpe)
 res1: u.Type = O.S2
diff --git a/test/files/run/t6146b.scala b/test/files/run/t6146b.scala
index adcd40d2ee..e63709aa9d 100644
--- a/test/files/run/t6146b.scala
+++ b/test/files/run/t6146b.scala
@@ -31,7 +31,8 @@ val fTpe = typeOf[O.type].decl(newTermName("foo")).paramss.head.head.tpe
 def memType(sub: Type, scrut: Type): Type =
   nestedMemberType(sub.typeSymbol, scrut.prefix, scrut.typeSymbol.owner)
 
-memType(S1, fTpe)
+val mt1 = memType(S1, fTpe)
+global.typeDeconstruct.show(mt1)
 memType(S2, fTpe)
 memType(S3, fTpe)
 memType(S4, fTpe)
diff --git a/test/files/run/t6223.scala b/test/files/run/t6223.scala
index fb176e32e6..0996ea1c45 100644
--- a/test/files/run/t6223.scala
+++ b/test/files/run/t6223.scala
@@ -5,7 +5,7 @@ class Foo[@specialized(Int) A](a:A) {
 object Test {
   def main(args:Array[String]) {
     val f = new Foo(333)
-    val ms = f.getClass().getDeclaredMethods().sortBy(_.getName)
-    ms.foreach(m => println(m.getName))
+    val ms = f.getClass().getDeclaredMethods().map(_.getName).sorted
+    ms.foreach(println)
   }
 }
diff --git a/test/files/run/t6387.check b/test/files/run/t6387.check
new file mode 100644
index 0000000000..83b33d238d
--- /dev/null
+++ b/test/files/run/t6387.check
@@ -0,0 +1 @@
+1000
diff --git a/test/files/run/t6387.scala b/test/files/run/t6387.scala
new file mode 100644
index 0000000000..bbebb5f511
--- /dev/null
+++ b/test/files/run/t6387.scala
@@ -0,0 +1,16 @@
+trait A {
+  def foo: Long
+}
+
+object Test {
+  def a(): A = new A {
+    var foo: Long = 1000L
+
+    val test = () => {
+      foo = 28
+    }
+  }
+  def main(args: Array[String]) {
+    println(a().foo)
+  }
+}
diff --git a/test/files/run/t7242.scala b/test/files/run/t7242.scala
new file mode 100644
index 0000000000..c995336144
--- /dev/null
+++ b/test/files/run/t7242.scala
@@ -0,0 +1,71 @@
+class CrashTest {
+  def foo = ()
+  trait CrashTestTable {
+    def cols = foo
+  }
+  // This was leading to a class between the mixed in
+  // outer accessor and the outer accessor of this object.
+  object CrashTestTable extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest1 {
+  def foo = ()
+  class CrashTestTable {
+    def cols = foo
+  }
+  object CrashTestTable extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest2 {
+  def foo = ()
+  trait CrashTestTable {
+    def cols = foo
+  }
+  object Obj extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest3 {
+  def foo = ()
+
+  def meth() {
+    trait CrashTestTable {
+      def cols = foo
+    }
+    object Obj extends CrashTestTable {
+      foo
+      cols
+    }
+    Obj
+  }
+}
+
+object Test extends App {
+  {
+    val c = new CrashTest
+    c.CrashTestTable
+  }
+
+  {
+    val c = new CrashTest1
+    c.CrashTestTable
+  }
+
+  {
+    val c = new CrashTest2
+    c.Obj
+  }
+
+  {
+    val c = new CrashTest3
+    c.meth()
+  }
+}
diff --git a/test/files/run/t7246.check b/test/files/run/t7246.check
new file mode 100755
index 0000000000..ce01362503
--- /dev/null
+++ b/test/files/run/t7246.check
@@ -0,0 +1 @@
+hello
diff --git a/test/files/run/t7246/Outer.java b/test/files/run/t7246/Outer.java
new file mode 100755
index 0000000000..163276fb3b
--- /dev/null
+++ b/test/files/run/t7246/Outer.java
@@ -0,0 +1,4 @@
+public class Outer {
+    public class Inner {
+    }
+}
\ No newline at end of file
diff --git a/test/files/run/t7246/Test.scala b/test/files/run/t7246/Test.scala
new file mode 100755
index 0000000000..9f23ca8f3a
--- /dev/null
+++ b/test/files/run/t7246/Test.scala
@@ -0,0 +1,16 @@
+object Test extends App {
+
+  val so = new SubOuter
+  val si = new so.SubInner
+  println(si.bar)
+}
+
+class SubOuter extends Outer {
+
+  val foo = "hello"
+
+  class SubInner extends Inner {
+    def bar = foo
+  }
+
+}
\ No newline at end of file
diff --git a/test/files/run/t7246b.check b/test/files/run/t7246b.check
new file mode 100755
index 0000000000..5073bd8617
--- /dev/null
+++ b/test/files/run/t7246b.check
@@ -0,0 +1,2 @@
+base
+sub
diff --git a/test/files/run/t7246b/Base.scala b/test/files/run/t7246b/Base.scala
new file mode 100755
index 0000000000..4e71d3313d
--- /dev/null
+++ b/test/files/run/t7246b/Base.scala
@@ -0,0 +1,7 @@
+class Base {
+  val baseOuter = "base"
+
+  class BaseInner {
+    val baseInner = baseOuter
+  }
+}
diff --git a/test/files/run/t7246b/Outer.java b/test/files/run/t7246b/Outer.java
new file mode 100755
index 0000000000..53a79316ef
--- /dev/null
+++ b/test/files/run/t7246b/Outer.java
@@ -0,0 +1,4 @@
+public class Outer extends Base {
+    public class Inner extends BaseInner {
+    }
+}
\ No newline at end of file
diff --git a/test/files/run/t7246b/Test.scala b/test/files/run/t7246b/Test.scala
new file mode 100755
index 0000000000..f0982ea8d0
--- /dev/null
+++ b/test/files/run/t7246b/Test.scala
@@ -0,0 +1,14 @@
+object Test extends App {
+
+  val so = new SubOuter
+  val si = new so.SubInner
+  println(si.baseInner)
+  println(si.subInner)
+}
+
+class SubOuter extends Outer {
+  val subOuter = "sub"
+  class SubInner extends Inner {
+    def subInner = subOuter
+  }
+}
diff --git a/test/files/run/t7249.check b/test/files/run/t7249.check
new file mode 100644
index 0000000000..7777e0a5a2
--- /dev/null
+++ b/test/files/run/t7249.check
@@ -0,0 +1 @@
+Yup!
diff --git a/test/files/run/t7249.scala b/test/files/run/t7249.scala
new file mode 100644
index 0000000000..375df5c3ad
--- /dev/null
+++ b/test/files/run/t7249.scala
@@ -0,0 +1,7 @@
+object Test extends App {
+  def bnToLambda(s: => String): () => String = () => s
+  var x: () => String = () => sys.error("Nope")
+  val y = bnToLambda { x() }
+  x = () => "Yup!"
+  println(y())
+}
diff --git a/test/files/run/t7290.scala b/test/files/run/t7290.scala
new file mode 100644
index 0000000000..01f7e8f68e
--- /dev/null
+++ b/test/files/run/t7290.scala
@@ -0,0 +1,9 @@
+object Test extends App {
+  val y = (0: Int) match {
+    case 1 => 1
+    case 0 | 0 => 0
+    case 2 | 2 | 2 | 3 | 2 | 3 => 0
+    case _ => -1
+  }
+  assert(y == 0, y)
+}
diff --git a/test/files/run/test-cpp.check b/test/files/run/test-cpp.check
index bfea438c60..13f4c64be3 100644
--- a/test/files/run/test-cpp.check
+++ b/test/files/run/test-cpp.check
@@ -1,65 +1,81 @@
-37c37
-<   locals: value args, value x, value y
----
->   locals: value args
-42,43d41
-<     52	CONSTANT(2)
-<     52	STORE_LOCAL(value x)
-45,46d42
-<     53	LOAD_LOCAL(value x)
-<     53	STORE_LOCAL(value y)
-49c45
-<     54	LOAD_LOCAL(value y)
----
->     54	CONSTANT(2)
-92c88
-<   locals: value args, value x, value y
----
->   locals: value args, value x
-101,102d96
-<     82	LOAD_LOCAL(value x)
-<     82	STORE_LOCAL(value y)
-105c99
-<     83	LOAD_LOCAL(value y)
----
->     83	LOAD_LOCAL(value x)
-135c129
-<   locals: value args, value x, value y
----
->   locals: value args
-140,141d133
-<     66	THIS(TestAliasChainDerefThis)
-<     66	STORE_LOCAL(value x)
-143,144d134
-<     67	LOAD_LOCAL(value x)
-<     67	STORE_LOCAL(value y)
-147c137
-<     68	LOAD_LOCAL(value y)
----
->     68	THIS(Object)
-176c166
-<   locals: value x, value y
----
->   locals: value x
-181,182d170
-<     29	LOAD_LOCAL(value x)
-<     29	STORE_LOCAL(value y)
-185c173
-<     30	LOAD_LOCAL(value y)
----
->     30	LOAD_LOCAL(value x)
-223,224d210
-<     97	LOAD_LOCAL(variable x)
-<     97	STORE_LOCAL(variable y)
-227c213
-<     98	LOAD_LOCAL(variable y)
----
->     98	LOAD_LOCAL(variable x)
-233,234d218
-<     101	LOAD_LOCAL(variable y)
-<     101	STORE_LOCAL(variable x)
-236c220
-<     102	LOAD_LOCAL(variable x)
----
->     102	LOAD_LOCAL(variable y)
-
+--- a
++++ b
+@@ -36,3 +36,3 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, value x, value y
++  locals: value args
+   startBlock: 1
+@@ -41,10 +41,6 @@
+   1: 
+-    52	CONSTANT(2)
+-    52	STORE_LOCAL(value x)
+     52	SCOPE_ENTER value x
+-    53	LOAD_LOCAL(value x)
+-    53	STORE_LOCAL(value y)
+     53	SCOPE_ENTER value y
+     54	LOAD_MODULE object Predef
+-    54	LOAD_LOCAL(value y)
++    54	CONSTANT(2)
+     54	BOX INT
+@@ -91,3 +87,3 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, value x, value y
++  locals: value args, value x
+   startBlock: 1
+@@ -100,7 +96,5 @@
+     81	SCOPE_ENTER value x
+-    82	LOAD_LOCAL(value x)
+-    82	STORE_LOCAL(value y)
+     82	SCOPE_ENTER value y
+     83	LOAD_MODULE object Predef
+-    83	LOAD_LOCAL(value y)
++    83	LOAD_LOCAL(value x)
+     83	BOX INT
+@@ -134,3 +128,3 @@
+   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
+-  locals: value args, value x, value y
++  locals: value args
+   startBlock: 1
+@@ -139,10 +133,6 @@
+   1: 
+-    66	THIS(TestAliasChainDerefThis)
+-    66	STORE_LOCAL(value x)
+     66	SCOPE_ENTER value x
+-    67	LOAD_LOCAL(value x)
+-    67	STORE_LOCAL(value y)
+     67	SCOPE_ENTER value y
+     68	LOAD_MODULE object Predef
+-    68	LOAD_LOCAL(value y)
++    68	THIS(Object)
+     68	CALL_METHOD scala.Predef.println (dynamic)
+@@ -175,3 +165,3 @@
+   def test(x: Int (INT)): Unit {
+-  locals: value x, value y
++  locals: value x
+   startBlock: 1
+@@ -180,7 +170,5 @@
+   1: 
+-    29	LOAD_LOCAL(value x)
+-    29	STORE_LOCAL(value y)
+     29	SCOPE_ENTER value y
+     30	LOAD_MODULE object Predef
+-    30	LOAD_LOCAL(value y)
++    30	LOAD_LOCAL(value x)
+     30	BOX INT
+@@ -222,7 +210,5 @@
+     96	SCOPE_ENTER variable x
+-    97	LOAD_LOCAL(variable x)
+-    97	STORE_LOCAL(variable y)
+     97	SCOPE_ENTER variable y
+     98	LOAD_MODULE object Predef
+-    98	LOAD_LOCAL(variable y)
++    98	LOAD_LOCAL(variable x)
+     98	BOX INT
+@@ -232,6 +218,4 @@
+     100	STORE_LOCAL(variable y)
+-    101	LOAD_LOCAL(variable y)
+-    101	STORE_LOCAL(variable x)
+     102	LOAD_MODULE object Predef
+-    102	LOAD_LOCAL(variable x)
++    102	LOAD_LOCAL(variable y)
+     102	BOX INT