1.1 --- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Fri Nov 30 15:14:25 2012 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Fri Nov 30 15:14:36 2012 +0000
1.3 @@ -288,21 +288,20 @@
1.4 JCExpression init;
1.5 switch(tree.kind) {
1.6
1.7 - case IMPLICIT_INNER: /** Inner # new */
1.8 - case SUPER: /** super # instMethod */
1.9 + case IMPLICIT_INNER: /** Inner :: new */
1.10 + case SUPER: /** super :: instMethod */
1.11 init = makeThis(
1.12 localContext.owner.owner.asType(),
1.13 localContext.owner);
1.14 break;
1.15
1.16 - case BOUND: /** Expr # instMethod */
1.17 + case BOUND: /** Expr :: instMethod */
1.18 init = tree.getQualifierExpression();
1.19 break;
1.20
1.21 - case STATIC_EVAL: /** Expr # staticMethod */
1.22 - case UNBOUND: /** Type # instMethod */
1.23 - case STATIC: /** Type # staticMethod */
1.24 - case TOPLEVEL: /** Top level # new */
1.25 + case UNBOUND: /** Type :: instMethod */
1.26 + case STATIC: /** Type :: staticMethod */
1.27 + case TOPLEVEL: /** Top level :: new */
1.28 init = null;
1.29 break;
1.30
1.31 @@ -315,14 +314,6 @@
1.32
1.33 //build a sam instance using an indy call to the meta-factory
1.34 result = makeMetaFactoryIndyCall(tree, tree.targetType, localContext.referenceKind(), refSym, indy_args);
1.35 -
1.36 - //if we had a static reference with non-static qualifier, add a let
1.37 - //expression to force the evaluation of the qualifier expr
1.38 - if (tree.hasKind(ReferenceKind.STATIC_EVAL)) {
1.39 - VarSymbol rec = new VarSymbol(0, names.fromString("rec$"), tree.getQualifierExpression().type, localContext.owner);
1.40 - JCVariableDecl recDef = make.VarDef(rec, tree.getQualifierExpression());
1.41 - result = make.LetExpr(recDef, result).setType(tree.type);
1.42 - }
1.43 }
1.44
1.45 /**
