diff -r d79536133493 -r 20f388573215 langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Mon Oct 29 10:39:49 2012 -0700
@@ -0,0 +1,1398 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.tools.javac.comp;
+
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
+import com.sun.tools.javac.tree.TreeMaker;
+import com.sun.tools.javac.tree.TreeScanner;
+import com.sun.tools.javac.tree.TreeTranslator;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Kinds;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol;
+import com.sun.tools.javac.code.Symbol.MethodSymbol;
+import com.sun.tools.javac.code.Symbol.VarSymbol;
+import com.sun.tools.javac.code.Symtab;
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.ClassType;
+import com.sun.tools.javac.code.Type.MethodType;
+import com.sun.tools.javac.code.Types;
+import com.sun.tools.javac.comp.LambdaToMethod.LambdaAnalyzer.*;
+import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static com.sun.tools.javac.comp.LambdaToMethod.LambdaSymbolKind.*;
+import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.TypeTag.BOT;
+import static com.sun.tools.javac.code.TypeTag.NONE;
+import static com.sun.tools.javac.code.TypeTag.VOID;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
+/**
+ * This pass desugars lambda expressions into static methods
+ *
+ *
This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
+public class LambdaToMethod extends TreeTranslator {
+
+ private Names names;
+ private Symtab syms;
+ private Resolve rs;
+ private TreeMaker make;
+ private Types types;
+ private TransTypes transTypes;
+ private Env attrEnv;
+
+ /** the analyzer scanner */
+ private LambdaAnalyzer analyzer;
+
+ /** map from lambda trees to translation contexts */
+ private Map> contextMap;
+
+ /** current translation context (visitor argument) */
+ private TranslationContext> context;
+
+ /** list of translated methods
+ **/
+ private ListBuffer translatedMethodList;
+
+ //
+ private static final Context.Key unlambdaKey =
+ new Context.Key();
+
+ public static LambdaToMethod instance(Context context) {
+ LambdaToMethod instance = context.get(unlambdaKey);
+ if (instance == null) {
+ instance = new LambdaToMethod(context);
+ }
+ return instance;
+ }
+
+ private LambdaToMethod(Context context) {
+ names = Names.instance(context);
+ syms = Symtab.instance(context);
+ rs = Resolve.instance(context);
+ make = TreeMaker.instance(context);
+ types = Types.instance(context);
+ transTypes = TransTypes.instance(context);
+ this.analyzer = makeAnalyzer();
+ }
+
+ private LambdaAnalyzer makeAnalyzer() {
+ return new LambdaAnalyzer();
+ }
+ //
+
+ //
+ @Override
+ public T translate(T tree) {
+ TranslationContext> newContext = contextMap.get(tree);
+ return translate(tree, newContext != null ? newContext : context);
+ }
+
+ public T translate(T tree, TranslationContext> newContext) {
+ TranslationContext> prevContext = context;
+ try {
+ context = newContext;
+ return super.translate(tree);
+ }
+ finally {
+ context = prevContext;
+ }
+ }
+
+ public List translate(List trees, TranslationContext> newContext) {
+ ListBuffer buf = ListBuffer.lb();
+ for (T tree : trees) {
+ buf.append(translate(tree, newContext));
+ }
+ return buf.toList();
+ }
+
+ public JCTree translateTopLevelClass(Env env, JCTree cdef, TreeMaker make) {
+ this.make = make;
+ this.attrEnv = env;
+ this.context = null;
+ this.contextMap = new HashMap>();
+ return translate(cdef);
+ }
+ //
+
+ //
+ /**
+ * Visit a class.
+ * Maintain the translatedMethodList across nested classes.
+ * Append the translatedMethodList to the class after it is translated.
+ * @param tree
+ */
+ @Override
+ public void visitClassDef(JCClassDecl tree) {
+ if (tree.sym.owner.kind == PCK) {
+ //analyze class
+ analyzer.analyzeClass(tree);
+ }
+ ListBuffer prevTranslated = translatedMethodList;
+ try {
+ translatedMethodList = ListBuffer.lb();
+ super.visitClassDef(tree);
+ //add all translated instance methods here
+ tree.defs = tree.defs.appendList(translatedMethodList.toList());
+ for (JCTree lambda : translatedMethodList) {
+ tree.sym.members().enter(((JCMethodDecl)lambda).sym);
+ }
+ result = tree;
+ } finally {
+ translatedMethodList = prevTranslated;
+ }
+ }
+
+ /**
+ * Translate a lambda into a method to be inserted into the class.
+ * Then replace the lambda site with an invokedynamic call of to lambda
+ * meta-factory, which will use the lambda method.
+ * @param tree
+ */
+ @Override
+ public void visitLambda(JCLambda tree) {
+ LambdaTranslationContext localContext = (LambdaTranslationContext)context;
+ MethodSymbol sym = (MethodSymbol)localContext.translatedSym;
+ MethodType lambdaType = (MethodType) sym.type;
+
+ //create the method declaration hoisting the lambda body
+ JCMethodDecl lambdaDecl = make.MethodDef(make.Modifiers(sym.flags_field),
+ sym.name,
+ make.QualIdent(lambdaType.getReturnType().tsym),
+ List.nil(),
+ localContext.syntheticParams,
+ lambdaType.getThrownTypes() == null ?
+ List.nil() :
+ make.Types(lambdaType.getThrownTypes()),
+ null,
+ null);
+ lambdaDecl.sym = sym;
+ lambdaDecl.type = lambdaType;
+
+ //translate lambda body
+ //As the lambda body is translated, all references to lambda locals,
+ //captured variables, enclosing members are adjusted accordingly
+ //to refer to the static method parameters (rather than i.e. acessing to
+ //captured members directly).
+ lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl));
+
+ //Add the method to the list of methods to be added to this class.
+ translatedMethodList = translatedMethodList.prepend(lambdaDecl);
+
+ //now that we have generated a method for the lambda expression,
+ //we can translate the lambda into a method reference pointing to the newly
+ //created method.
+ //
+ //Note that we need to adjust the method handle so that it will match the
+ //signature of the SAM descriptor - this means that the method reference
+ //should be added the following synthetic arguments:
+ //
+ // * the "this" argument if it is an instance method
+ // * enclosing locals captured by the lambda expression
+
+ ListBuffer syntheticInits = ListBuffer.lb();
+
+ if (!sym.isStatic()) {
+ syntheticInits.append(makeThis(
+ sym.owner.asType(),
+ localContext.owner.enclClass()));
+ }
+
+ //add captured locals
+ for (Symbol fv : localContext.getSymbolMap(CAPTURED_VAR).keySet()) {
+ if (fv != localContext.self) {
+ JCTree captured_local = make.Ident(fv).setType(fv.type);
+ syntheticInits.append((JCExpression) captured_local);
+ }
+ }
+
+ //then, determine the arguments to the indy call
+ List indy_args = translate(syntheticInits.toList(), localContext.prev);
+
+ //build a sam instance using an indy call to the meta-factory
+ int refKind = referenceKind(sym);
+
+ //convert to an invokedynamic call
+ result = makeMetaFactoryIndyCall(tree, tree.targetType, refKind, sym, indy_args);
+ }
+
+ private JCIdent makeThis(Type type, Symbol owner) {
+ VarSymbol _this = new VarSymbol(PARAMETER | FINAL | SYNTHETIC,
+ names._this,
+ type,
+ owner);
+ return make.Ident(_this);
+ }
+
+ /**
+ * Translate a method reference into an invokedynamic call to the
+ * meta-factory.
+ * @param tree
+ */
+ @Override
+ public void visitReference(JCMemberReference tree) {
+ ReferenceTranslationContext localContext = (ReferenceTranslationContext)context;
+
+ //first determine the method symbol to be used to generate the sam instance
+ //this is either the method reference symbol, or the bridged reference symbol
+ Symbol refSym = localContext.needsBridge() ?
+ localContext.bridgeSym :
+ tree.sym;
+
+ //build the bridge method, if needed
+ if (localContext.needsBridge()) {
+ bridgeMemberReference(tree, localContext);
+ }
+
+ //the qualifying expression is treated as a special captured arg
+ JCExpression init;
+ switch(tree.kind) {
+
+ case IMPLICIT_INNER: /** Inner # new */
+ case SUPER: /** super # instMethod */
+ init = makeThis(
+ localContext.owner.owner.asType(),
+ localContext.owner);
+ break;
+
+ case BOUND: /** Expr # instMethod */
+ init = tree.getQualifierExpression();
+ break;
+
+ case STATIC_EVAL: /** Expr # staticMethod */
+ case UNBOUND: /** Type # instMethod */
+ case STATIC: /** Type # staticMethod */
+ case TOPLEVEL: /** Top level # new */
+ init = null;
+ break;
+
+ default:
+ throw new InternalError("Should not have an invalid kind");
+ }
+
+ List indy_args = init==null? List.nil() : translate(List.of(init), localContext.prev);
+
+
+ //build a sam instance using an indy call to the meta-factory
+ result = makeMetaFactoryIndyCall(tree, tree.targetType, localContext.referenceKind(), refSym, indy_args);
+
+ //if we had a static reference with non-static qualifier, add a let
+ //expression to force the evaluation of the qualifier expr
+ if (tree.hasKind(ReferenceKind.STATIC_EVAL)) {
+ VarSymbol rec = new VarSymbol(0, names.fromString("rec$"), tree.getQualifierExpression().type, localContext.owner);
+ JCVariableDecl recDef = make.VarDef(rec, tree.getQualifierExpression());
+ result = make.LetExpr(recDef, result).setType(tree.type);
+ }
+ }
+
+ /**
+ * Translate identifiers within a lambda to the mapped identifier
+ * @param tree
+ */
+ @Override
+ public void visitIdent(JCIdent tree) {
+ if (context == null || !analyzer.lambdaIdentSymbolFilter(tree.sym)) {
+ super.visitIdent(tree);
+ } else {
+ LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context;
+ if (lambdaContext.getSymbolMap(PARAM).containsKey(tree.sym)) {
+ Symbol translatedSym = lambdaContext.getSymbolMap(PARAM).get(tree.sym);
+ result = make.Ident(translatedSym).setType(tree.type);
+ } else if (lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
+ Symbol translatedSym = lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym);
+ result = make.Ident(translatedSym).setType(tree.type);
+ } else if (lambdaContext.getSymbolMap(CAPTURED_VAR).containsKey(tree.sym)) {
+ Symbol translatedSym = lambdaContext.getSymbolMap(CAPTURED_VAR).get(tree.sym);
+ result = make.Ident(translatedSym).setType(tree.type);
+ } else {
+ if (tree.sym.owner.kind == Kinds.TYP) {
+ for (Map.Entry encl_entry : lambdaContext.getSymbolMap(CAPTURED_THIS).entrySet()) {
+ if (tree.sym.isMemberOf((ClassSymbol) encl_entry.getKey(), types)) {
+ JCExpression enclRef = make.Ident(encl_entry.getValue());
+ result = tree.sym.name == names._this
+ ? enclRef.setType(tree.type)
+ : make.Select(enclRef, tree.sym).setType(tree.type);
+ result = tree;
+ return;
+ }
+ }
+ }
+ //access to untranslated symbols (i.e. compile-time constants,
+ //members defined inside the lambda body, etc.) )
+ super.visitIdent(tree);
+ }
+ }
+ }
+
+ @Override
+ public void visitVarDef(JCVariableDecl tree) {
+ LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context;
+ if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
+ JCExpression init = translate(tree.init);
+ result = make.VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init);
+ } else {
+ super.visitVarDef(tree);
+ }
+ }
+
+ //
+
+ //
+
+ private JCBlock makeLambdaBody(JCLambda tree, JCMethodDecl lambdaMethodDecl) {
+ return tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION ?
+ makeLambdaExpressionBody((JCExpression)tree.body, lambdaMethodDecl) :
+ makeLambdaStatementBody((JCBlock)tree.body, lambdaMethodDecl, tree.canCompleteNormally);
+ }
+
+ private JCBlock makeLambdaExpressionBody(JCExpression expr, JCMethodDecl lambdaMethodDecl) {
+ Type restype = lambdaMethodDecl.type.getReturnType();
+ boolean isLambda_void = expr.type.hasTag(VOID);
+ boolean isTarget_void = restype.hasTag(VOID);
+ boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
+ if (isTarget_void) {
+ //target is void:
+ // BODY;
+ JCStatement stat = make.Exec(expr);
+ return make.Block(0, List.of(stat));
+ } else if (isLambda_void && isTarget_Void) {
+ //void to Void conversion:
+ // BODY; return null;
+ ListBuffer stats = ListBuffer.lb();
+ stats.append(make.Exec(expr));
+ stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
+ return make.Block(0, stats.toList());
+ } else {
+ //non-void to non-void conversion:
+ // return (TYPE)BODY;
+ JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype);
+ return make.Block(0, List.of(make.Return(retExpr)));
+ }
+ }
+
+ private JCBlock makeLambdaStatementBody(JCBlock block, final JCMethodDecl lambdaMethodDecl, boolean completeNormally) {
+ final Type restype = lambdaMethodDecl.type.getReturnType();
+ final boolean isTarget_void = restype.hasTag(VOID);
+ boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
+
+ class LambdaBodyTranslator extends TreeTranslator {
+
+ @Override
+ public void visitClassDef(JCClassDecl tree) {
+ //do NOT recurse on any inner classes
+ result = tree;
+ }
+
+ @Override
+ public void visitLambda(JCLambda tree) {
+ //do NOT recurse on any nested lambdas
+ result = tree;
+ }
+
+ @Override
+ public void visitReturn(JCReturn tree) {
+ boolean isLambda_void = tree.expr == null;
+ if (isTarget_void && !isLambda_void) {
+ //Void to void conversion:
+ // { TYPE $loc = RET-EXPR; return; }
+ VarSymbol loc = makeSyntheticVar(0, names.fromString("$loc"), tree.expr.type, lambdaMethodDecl.sym);
+ JCVariableDecl varDef = make.VarDef(loc, tree.expr);
+ result = make.Block(0, List.of(varDef, make.Return(null)));
+ } else if (!isTarget_void || !isLambda_void) {
+ //non-void to non-void conversion:
+ // return (TYPE)RET-EXPR;
+ tree.expr = transTypes.coerce(attrEnv, tree.expr, restype);
+ result = tree;
+ } else {
+ result = tree;
+ }
+
+ }
+ }
+
+ JCBlock trans_block = new LambdaBodyTranslator().translate(block);
+ if (completeNormally && isTarget_Void) {
+ //there's no return statement and the lambda (possibly inferred)
+ //return type is java.lang.Void; emit a synthetic return statement
+ trans_block.stats = trans_block.stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
+ }
+ return trans_block;
+ }
+
+ /**
+ * Create new synthetic method with given flags, name, type, owner
+ */
+ private MethodSymbol makeSyntheticMethod(long flags, Name name, Type type, Symbol owner) {
+ return new MethodSymbol(flags | SYNTHETIC, name, type, owner);
+ }
+
+ /**
+ * Create new synthetic variable with given flags, name, type, owner
+ */
+ private VarSymbol makeSyntheticVar(long flags, String name, Type type, Symbol owner) {
+ return makeSyntheticVar(flags, names.fromString(name), type, owner);
+ }
+
+ /**
+ * Create new synthetic variable with given flags, name, type, owner
+ */
+ private VarSymbol makeSyntheticVar(long flags, Name name, Type type, Symbol owner) {
+ return new VarSymbol(flags | SYNTHETIC, name, type, owner);
+ }
+
+ /**
+ * Set varargsElement field on a given tree (must be either a new class tree
+ * or a method call tree)
+ */
+ private void setVarargsIfNeeded(JCTree tree, Type varargsElement) {
+ if (varargsElement != null) {
+ switch (tree.getTag()) {
+ case APPLY: ((JCMethodInvocation)tree).varargsElement = varargsElement; break;
+ case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break;
+ default: throw new AssertionError();
+ }
+ }
+ }
+
+ /**
+ * Convert method/constructor arguments by inserting appropriate cast
+ * as required by type-erasure - this is needed when bridging a lambda/method
+ * reference, as the bridged signature might require downcast to be compatible
+ * with the generated signature.
+ */
+ private List convertArgs(Symbol meth, List args, Type varargsElement) {
+ Assert.check(meth.kind == Kinds.MTH);
+ List formals = types.erasure(meth.type).getParameterTypes();
+ if (varargsElement != null) {
+ Assert.check((meth.flags() & VARARGS) != 0);
+ }
+ return transTypes.translateArgs(args, formals, varargsElement, attrEnv);
+ }
+
+ //
+
+ private MethodSymbol makeSamDescriptor(Type targetType) {
+ return (MethodSymbol)types.findDescriptorSymbol(targetType.tsym);
+ }
+
+ private Type makeFunctionalDescriptorType(Type targetType, MethodSymbol samDescriptor, boolean erased) {
+ Type descType = types.memberType(targetType, samDescriptor);
+ return erased ? types.erasure(descType) : descType;
+ }
+
+ private Type makeFunctionalDescriptorType(Type targetType, boolean erased) {
+ return makeFunctionalDescriptorType(targetType, makeSamDescriptor(targetType), erased);
+ }
+
+ /**
+ * Generate an adapter method "bridge" for a method reference which cannot
+ * be used directly.
+ */
+ private class MemberReferenceBridger {
+
+ private final JCMemberReference tree;
+ private final ReferenceTranslationContext localContext;
+ private final ListBuffer args = ListBuffer.lb();
+ private final ListBuffer params = ListBuffer.lb();
+
+ MemberReferenceBridger(JCMemberReference tree, ReferenceTranslationContext localContext) {
+ this.tree = tree;
+ this.localContext = localContext;
+ }
+
+ /**
+ * Generate the bridge
+ */
+ JCMethodDecl bridge() {
+ int prevPos = make.pos;
+ try {
+ make.at(tree);
+ Type samDesc = localContext.bridgedRefSig();
+ List samPTypes = samDesc.getParameterTypes();
+
+ //an extra argument is prepended to the signature of the bridge in case
+ //the member reference is an instance method reference (in which case
+ //the receiver expression is passed to the bridge itself).
+ Type recType = null;
+ switch (tree.kind) {
+ case IMPLICIT_INNER:
+ recType = tree.sym.owner.type.getEnclosingType();
+ break;
+ case BOUND:
+ recType = tree.getQualifierExpression().type;
+ break;
+ case UNBOUND:
+ recType = samPTypes.head;
+ samPTypes = samPTypes.tail;
+ break;
+ }
+
+ //generate the parameter list for the bridged member reference - the
+ //bridge signature will match the signature of the target sam descriptor
+
+ VarSymbol rcvr = (recType == null)
+ ? null
+ : addParameter("rec$", recType, false);
+
+ List refPTypes = tree.sym.type.getParameterTypes();
+ int refSize = refPTypes.size();
+ int samSize = samPTypes.size();
+ int last = localContext.needsVarArgsConversion() ? refSize - 1 : refSize; // Last parameter to copy from referenced method
+
+ List l = refPTypes;
+ // Use parameter types of the referenced method, excluding final var args
+ for (int i = 0; l.nonEmpty() && i < last; ++i) {
+ addParameter("x$" + i, l.head, true);
+ l = l.tail;
+ }
+ // Flatten out the var args
+ for (int i = last; i < samSize; ++i) {
+ addParameter("xva$" + i, tree.varargsElement, true);
+ }
+
+ //generate the bridge method declaration
+ JCMethodDecl bridgeDecl = make.MethodDef(make.Modifiers(localContext.bridgeSym.flags()),
+ localContext.bridgeSym.name,
+ make.QualIdent(samDesc.getReturnType().tsym),
+ List.nil(),
+ params.toList(),
+ tree.sym.type.getThrownTypes() == null
+ ? List.nil()
+ : make.Types(tree.sym.type.getThrownTypes()),
+ null,
+ null);
+ bridgeDecl.sym = (MethodSymbol) localContext.bridgeSym;
+ bridgeDecl.type = localContext.bridgeSym.type = types.createMethodTypeWithParameters(samDesc, TreeInfo.types(params.toList()));
+
+ //bridge method body generation - this can be either a method call or a
+ //new instance creation expression, depending on the member reference kind
+ JCExpression bridgeExpr = (tree.getMode() == ReferenceMode.INVOKE)
+ ? bridgeExpressionInvoke(rcvr)
+ : bridgeExpressionNew();
+
+ //the body is either a return expression containing a method call,
+ //or the method call itself, depending on whether the return type of
+ //the bridge is non-void/void.
+ bridgeDecl.body = makeLambdaExpressionBody(bridgeExpr, bridgeDecl);
+
+ return bridgeDecl;
+ } finally {
+ make.at(prevPos);
+ }
+ }
+
+ /**
+ * determine the receiver of the bridged method call - the receiver can
+ * be either the synthetic receiver parameter or a type qualifier; the
+ * original qualifier expression is never used here, as it might refer
+ * to symbols not available in the static context of the bridge
+ */
+ private JCExpression bridgeExpressionInvoke(VarSymbol rcvr) {
+ JCExpression qualifier =
+ tree.sym.isStatic() ?
+ make.Type(tree.sym.owner.type) :
+ (rcvr != null) ?
+ make.Ident(rcvr) :
+ tree.getQualifierExpression();
+
+ //create the qualifier expression
+ JCFieldAccess select = make.Select(qualifier, tree.sym.name);
+ select.sym = tree.sym;
+ select.type = tree.sym.erasure(types);
+
+ //create the method call expression
+ JCExpression apply = make.Apply(List.nil(), select,
+ convertArgs(tree.sym, args.toList(), tree.varargsElement)).setType(tree.sym.erasure(types).getReturnType());
+
+ apply = transTypes.coerce(apply, localContext.generatedRefSig().getReturnType());
+ setVarargsIfNeeded(apply, tree.varargsElement);
+ return apply;
+ }
+
+ /**
+ * the enclosing expression is either 'null' (no enclosing type) or set
+ * to the first bridge synthetic parameter
+ */
+ private JCExpression bridgeExpressionNew() {
+ JCExpression encl = null;
+ switch (tree.kind) {
+ case UNBOUND:
+ case IMPLICIT_INNER:
+ encl = make.Ident(params.first());
+ }
+
+ //create the instance creation expression
+ JCNewClass newClass = make.NewClass(encl,
+ List.nil(),
+ make.Type(tree.getQualifierExpression().type),
+ convertArgs(tree.sym, args.toList(), tree.varargsElement),
+ null);
+ newClass.constructor = tree.sym;
+ newClass.constructorType = tree.sym.erasure(types);
+ newClass.type = tree.getQualifierExpression().type;
+ setVarargsIfNeeded(newClass, tree.varargsElement);
+ return newClass;
+ }
+
+ private VarSymbol addParameter(String name, Type p, boolean genArg) {
+ VarSymbol vsym = new VarSymbol(0, names.fromString(name), p, localContext.bridgeSym);
+ params.append(make.VarDef(vsym, null));
+ if (genArg) {
+ args.append(make.Ident(vsym));
+ }
+ return vsym;
+ }
+ }
+
+ /**
+ * Bridges a member reference - this is needed when:
+ * * Var args in the referenced method need to be flattened away
+ * * super is used
+ */
+ private void bridgeMemberReference(JCMemberReference tree, ReferenceTranslationContext localContext) {
+ JCMethodDecl bridgeDecl = (new MemberReferenceBridger(tree, localContext).bridge());
+ translatedMethodList = translatedMethodList.prepend(bridgeDecl);
+ }
+
+ /**
+ * Generate an indy method call to the meta factory
+ */
+ private JCExpression makeMetaFactoryIndyCall(JCExpression tree, Type targetType, int refKind, Symbol refSym, List indy_args) {
+ //determine the static bsm args
+ Type mtype = makeFunctionalDescriptorType(targetType, true);
+ List