Merge commit '97b9b2c06a' from 2.10.x into master

Check files updated: test/files/presentation/t8085*.check

Conflicts:
	build.xml
	src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
	src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala

Author: adriaanm

src/main/java/scala/tools/asm/MethodWriter.java

@@ -1869,7 +1869,12 @@ final int getSize() {
         int size = 8;
         if (code.length > 0) {
             if (code.length > 65536) {
-                throw new RuntimeException("Method code too large!");
+                String nameString = "";
+                int i = 0;
+                // find item that corresponds to the index of our name
+                while (i < cw.items.length && (cw.items[i] == null || cw.items[i].index != name)) i++;
+                if (cw.items[i] != null) nameString = cw.items[i].strVal1 +"'s ";
+                throw new RuntimeException("Method "+ nameString +"code too large!");
             }
             cw.newUTF8("Code");
             size += 18 + code.length + 8 * handlerCount;