1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Feb 12 19:25:09 2013 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Feb 12 17:15:29 2013 -0800
1.3 @@ -1470,12 +1470,13 @@
1.4 position.type = type;
1.5
1.6 switch (type) {
1.7 - // type cast
1.8 - case CAST:
1.9 // instanceof
1.10 case INSTANCEOF:
1.11 // new expression
1.12 case NEW:
1.13 + // constructor/method reference receiver
1.14 + case CONSTRUCTOR_REFERENCE:
1.15 + case METHOD_REFERENCE:
1.16 position.offset = nextChar();
1.17 break;
1.18 // local variable
1.19 @@ -1524,9 +1525,12 @@
1.20 case METHOD_FORMAL_PARAMETER:
1.21 position.parameter_index = nextByte();
1.22 break;
1.23 + // type cast
1.24 + case CAST:
1.25 // method/constructor/reference type argument
1.26 case CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT:
1.27 case METHOD_INVOCATION_TYPE_ARGUMENT:
1.28 + case CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT:
1.29 case METHOD_REFERENCE_TYPE_ARGUMENT:
1.30 position.offset = nextChar();
1.31 position.type_index = nextByte();
1.32 @@ -1535,10 +1539,6 @@
1.33 case METHOD_RETURN:
1.34 case FIELD:
1.35 break;
1.36 - // lambda formal parameter
1.37 - case LAMBDA_FORMAL_PARAMETER:
1.38 - position.parameter_index = nextByte();
1.39 - break;
1.40 case UNKNOWN:
1.41 throw new AssertionError("jvm.ClassReader: UNKNOWN target type should never occur!");
1.42 default:
