src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

Wed, 15 May 2013 14:00:31 +0100

author
mcimadamore
date
Wed, 15 May 2013 14:00:31 +0100
changeset 1759
05ec778794d0
parent 1755
ddb4a2bfcd82
child 1762
31ef33db5e0e
permissions
-rw-r--r--

8012003: Method diagnostics resolution need to be simplified in some cases
Summary: Unfold method resolution diagnostics when they mention errors in poly expressions
Reviewed-by: jjg, vromero

rfield@1380 1 /*
mcimadamore@1595 2 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
rfield@1380 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
rfield@1380 4 *
rfield@1380 5 * This code is free software; you can redistribute it and/or modify it
rfield@1380 6 * under the terms of the GNU General Public License version 2 only, as
rfield@1380 7 * published by the Free Software Foundation. Oracle designates this
rfield@1380 8 * particular file as subject to the "Classpath" exception as provided
rfield@1380 9 * by Oracle in the LICENSE file that accompanied this code.
rfield@1380 10 *
rfield@1380 11 * This code is distributed in the hope that it will be useful, but WITHOUT
rfield@1380 12 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
rfield@1380 13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
rfield@1380 14 * version 2 for more details (a copy is included in the LICENSE file that
rfield@1380 15 * accompanied this code).
rfield@1380 16 *
rfield@1380 17 * You should have received a copy of the GNU General Public License version
rfield@1380 18 * 2 along with this work; if not, write to the Free Software Foundation,
rfield@1380 19 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
rfield@1380 20 *
rfield@1380 21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
rfield@1380 22 * or visit www.oracle.com if you need additional information or have any
rfield@1380 23 * questions.
rfield@1380 24 */
rfield@1380 25 package com.sun.tools.javac.comp;
rfield@1380 26
rfield@1380 27 import com.sun.tools.javac.tree.*;
rfield@1380 28 import com.sun.tools.javac.tree.JCTree.*;
rfield@1380 29 import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
rfield@1380 30 import com.sun.tools.javac.tree.TreeMaker;
rfield@1380 31 import com.sun.tools.javac.tree.TreeScanner;
rfield@1380 32 import com.sun.tools.javac.tree.TreeTranslator;
jjg@1755 33 import com.sun.tools.javac.code.Attribute;
rfield@1380 34 import com.sun.tools.javac.code.Kinds;
rfield@1587 35 import com.sun.tools.javac.code.Scope;
rfield@1380 36 import com.sun.tools.javac.code.Symbol;
rfield@1380 37 import com.sun.tools.javac.code.Symbol.ClassSymbol;
rfield@1380 38 import com.sun.tools.javac.code.Symbol.DynamicMethodSymbol;
rfield@1380 39 import com.sun.tools.javac.code.Symbol.MethodSymbol;
rfield@1380 40 import com.sun.tools.javac.code.Symbol.VarSymbol;
rfield@1380 41 import com.sun.tools.javac.code.Symtab;
rfield@1380 42 import com.sun.tools.javac.code.Type;
rfield@1380 43 import com.sun.tools.javac.code.Type.MethodType;
rfield@1380 44 import com.sun.tools.javac.code.Types;
rfield@1717 45 import com.sun.tools.javac.comp.LambdaToMethod.LambdaAnalyzerPreprocessor.*;
mcimadamore@1612 46 import com.sun.tools.javac.comp.Lower.BasicFreeVarCollector;
rfield@1380 47 import com.sun.tools.javac.jvm.*;
rfield@1380 48 import com.sun.tools.javac.util.*;
rfield@1380 49 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
rfield@1380 50 import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
rfield@1380 51
rfield@1380 52 import java.util.HashMap;
rfield@1380 53 import java.util.LinkedHashMap;
rfield@1380 54 import java.util.Map;
rfield@1380 55
rfield@1380 56 import static com.sun.tools.javac.comp.LambdaToMethod.LambdaSymbolKind.*;
rfield@1380 57 import static com.sun.tools.javac.code.Flags.*;
rfield@1380 58 import static com.sun.tools.javac.code.Kinds.*;
rfield@1587 59 import static com.sun.tools.javac.code.TypeTag.*;
rfield@1380 60 import static com.sun.tools.javac.tree.JCTree.Tag.*;
rfield@1380 61
rfield@1380 62 /**
rfield@1380 63 * This pass desugars lambda expressions into static methods
rfield@1380 64 *
rfield@1380 65 * <p><b>This is NOT part of any supported API.
rfield@1380 66 * If you write code that depends on this, you do so at your own risk.
rfield@1380 67 * This code and its internal interfaces are subject to change or
rfield@1380 68 * deletion without notice.</b>
rfield@1380 69 */
rfield@1380 70 public class LambdaToMethod extends TreeTranslator {
rfield@1380 71
mcimadamore@1612 72 private Lower lower;
rfield@1380 73 private Names names;
rfield@1380 74 private Symtab syms;
rfield@1380 75 private Resolve rs;
rfield@1380 76 private TreeMaker make;
rfield@1380 77 private Types types;
rfield@1380 78 private TransTypes transTypes;
rfield@1380 79 private Env<AttrContext> attrEnv;
rfield@1380 80
rfield@1380 81 /** the analyzer scanner */
rfield@1717 82 private LambdaAnalyzerPreprocessor analyzer;
rfield@1380 83
rfield@1380 84 /** map from lambda trees to translation contexts */
rfield@1380 85 private Map<JCTree, TranslationContext<?>> contextMap;
rfield@1380 86
rfield@1380 87 /** current translation context (visitor argument) */
rfield@1380 88 private TranslationContext<?> context;
rfield@1380 89
rfield@1587 90 /** info about the current class being processed */
rfield@1587 91 private KlassInfo kInfo;
rfield@1587 92
rfield@1587 93 /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */
rfield@1587 94 public static final int FLAG_SERIALIZABLE = 1 << 0;
rfield@1587 95
rfield@1587 96 /** Flag for alternate metafactories indicating the lambda object has multiple targets */
rfield@1587 97 public static final int FLAG_MARKERS = 1 << 1;
rfield@1587 98
rfield@1587 99 private class KlassInfo {
rfield@1587 100
rfield@1587 101 /**
rfield@1587 102 * list of methods to append
rfield@1587 103 */
rfield@1587 104 private ListBuffer<JCTree> appendedMethodList;
rfield@1587 105
rfield@1587 106 /**
rfield@1587 107 * list of deserialization cases
rfield@1587 108 */
rfield@1587 109 private final Map<String, ListBuffer<JCStatement>> deserializeCases;
rfield@1587 110
rfield@1587 111 /**
rfield@1587 112 * deserialize method symbol
rfield@1587 113 */
rfield@1587 114 private final MethodSymbol deserMethodSym;
rfield@1587 115
rfield@1587 116 /**
rfield@1587 117 * deserialize method parameter symbol
rfield@1587 118 */
rfield@1587 119 private final VarSymbol deserParamSym;
rfield@1587 120
rfield@1587 121 private KlassInfo(Symbol kSym) {
rfield@1587 122 appendedMethodList = ListBuffer.lb();
rfield@1587 123 deserializeCases = new HashMap<String, ListBuffer<JCStatement>>();
rfield@1587 124 long flags = PRIVATE | STATIC | SYNTHETIC;
rfield@1587 125 MethodType type = new MethodType(List.of(syms.serializedLambdaType), syms.objectType,
rfield@1587 126 List.<Type>nil(), syms.methodClass);
rfield@1587 127 deserMethodSym = makeSyntheticMethod(flags, names.deserializeLambda, type, kSym);
mcimadamore@1595 128 deserParamSym = new VarSymbol(FINAL, names.fromString("lambda"),
mcimadamore@1595 129 syms.serializedLambdaType, deserMethodSym);
rfield@1587 130 }
rfield@1587 131
rfield@1587 132 private void addMethod(JCTree decl) {
rfield@1587 133 appendedMethodList = appendedMethodList.prepend(decl);
rfield@1587 134 }
rfield@1587 135 }
rfield@1380 136
rfield@1380 137 // <editor-fold defaultstate="collapsed" desc="Instantiating">
rfield@1380 138 private static final Context.Key<LambdaToMethod> unlambdaKey =
rfield@1380 139 new Context.Key<LambdaToMethod>();
rfield@1380 140
rfield@1380 141 public static LambdaToMethod instance(Context context) {
rfield@1380 142 LambdaToMethod instance = context.get(unlambdaKey);
rfield@1380 143 if (instance == null) {
rfield@1380 144 instance = new LambdaToMethod(context);
rfield@1380 145 }
rfield@1380 146 return instance;
rfield@1380 147 }
rfield@1380 148
rfield@1380 149 private LambdaToMethod(Context context) {
mcimadamore@1612 150 lower = Lower.instance(context);
rfield@1380 151 names = Names.instance(context);
rfield@1380 152 syms = Symtab.instance(context);
rfield@1380 153 rs = Resolve.instance(context);
rfield@1380 154 make = TreeMaker.instance(context);
rfield@1380 155 types = Types.instance(context);
rfield@1380 156 transTypes = TransTypes.instance(context);
rfield@1717 157 analyzer = new LambdaAnalyzerPreprocessor();
rfield@1380 158 }
rfield@1380 159 // </editor-fold>
rfield@1380 160
rfield@1380 161 // <editor-fold defaultstate="collapsed" desc="translate methods">
rfield@1380 162 @Override
rfield@1380 163 public <T extends JCTree> T translate(T tree) {
rfield@1380 164 TranslationContext<?> newContext = contextMap.get(tree);
rfield@1380 165 return translate(tree, newContext != null ? newContext : context);
rfield@1380 166 }
rfield@1380 167
rfield@1380 168 public <T extends JCTree> T translate(T tree, TranslationContext<?> newContext) {
rfield@1380 169 TranslationContext<?> prevContext = context;
rfield@1380 170 try {
rfield@1380 171 context = newContext;
rfield@1380 172 return super.translate(tree);
rfield@1380 173 }
rfield@1380 174 finally {
rfield@1380 175 context = prevContext;
rfield@1380 176 }
rfield@1380 177 }
rfield@1380 178
rfield@1380 179 public <T extends JCTree> List<T> translate(List<T> trees, TranslationContext<?> newContext) {
rfield@1380 180 ListBuffer<T> buf = ListBuffer.lb();
rfield@1380 181 for (T tree : trees) {
rfield@1380 182 buf.append(translate(tree, newContext));
rfield@1380 183 }
rfield@1380 184 return buf.toList();
rfield@1380 185 }
rfield@1380 186
rfield@1380 187 public JCTree translateTopLevelClass(Env<AttrContext> env, JCTree cdef, TreeMaker make) {
rfield@1380 188 this.make = make;
rfield@1380 189 this.attrEnv = env;
rfield@1380 190 this.context = null;
rfield@1380 191 this.contextMap = new HashMap<JCTree, TranslationContext<?>>();
rfield@1380 192 return translate(cdef);
rfield@1380 193 }
rfield@1380 194 // </editor-fold>
rfield@1380 195
rfield@1380 196 // <editor-fold defaultstate="collapsed" desc="visitor methods">
rfield@1380 197 /**
rfield@1380 198 * Visit a class.
rfield@1380 199 * Maintain the translatedMethodList across nested classes.
rfield@1380 200 * Append the translatedMethodList to the class after it is translated.
rfield@1380 201 * @param tree
rfield@1380 202 */
rfield@1380 203 @Override
rfield@1380 204 public void visitClassDef(JCClassDecl tree) {
rfield@1380 205 if (tree.sym.owner.kind == PCK) {
rfield@1380 206 //analyze class
rfield@1717 207 tree = analyzer.analyzeAndPreprocessClass(tree);
rfield@1380 208 }
rfield@1587 209 KlassInfo prevKlassInfo = kInfo;
rfield@1380 210 try {
rfield@1587 211 kInfo = new KlassInfo(tree.sym);
rfield@1380 212 super.visitClassDef(tree);
rfield@1587 213 if (!kInfo.deserializeCases.isEmpty()) {
rfield@1587 214 kInfo.addMethod(makeDeserializeMethod(tree.sym));
rfield@1587 215 }
rfield@1380 216 //add all translated instance methods here
rfield@1587 217 List<JCTree> newMethods = kInfo.appendedMethodList.toList();
rfield@1587 218 tree.defs = tree.defs.appendList(newMethods);
rfield@1587 219 for (JCTree lambda : newMethods) {
rfield@1380 220 tree.sym.members().enter(((JCMethodDecl)lambda).sym);
rfield@1380 221 }
rfield@1380 222 result = tree;
rfield@1380 223 } finally {
rfield@1587 224 kInfo = prevKlassInfo;
rfield@1380 225 }
rfield@1380 226 }
rfield@1380 227
rfield@1380 228 /**
rfield@1380 229 * Translate a lambda into a method to be inserted into the class.
rfield@1380 230 * Then replace the lambda site with an invokedynamic call of to lambda
rfield@1380 231 * meta-factory, which will use the lambda method.
rfield@1380 232 * @param tree
rfield@1380 233 */
rfield@1380 234 @Override
rfield@1380 235 public void visitLambda(JCLambda tree) {
rfield@1380 236 LambdaTranslationContext localContext = (LambdaTranslationContext)context;
rfield@1380 237 MethodSymbol sym = (MethodSymbol)localContext.translatedSym;
rfield@1380 238 MethodType lambdaType = (MethodType) sym.type;
rfield@1380 239
jjg@1755 240 {
jjg@1755 241 MethodSymbol owner = (MethodSymbol) localContext.owner;
jjg@1755 242 ListBuffer<Attribute.TypeCompound> ownerTypeAnnos = new ListBuffer<Attribute.TypeCompound>();
jjg@1755 243 ListBuffer<Attribute.TypeCompound> lambdaTypeAnnos = new ListBuffer<Attribute.TypeCompound>();
jjg@1755 244
jjg@1755 245 for (Attribute.TypeCompound tc : owner.getRawTypeAttributes()) {
jjg@1755 246 if (tc.position.onLambda == tree) {
jjg@1755 247 lambdaTypeAnnos.append(tc);
jjg@1755 248 } else {
jjg@1755 249 ownerTypeAnnos.append(tc);
jjg@1755 250 }
jjg@1755 251 }
jjg@1755 252 if (lambdaTypeAnnos.nonEmpty()) {
jjg@1755 253 owner.annotations.setTypeAttributes(ownerTypeAnnos.toList());
jjg@1755 254 sym.annotations.setTypeAttributes(lambdaTypeAnnos.toList());
jjg@1755 255 }
jjg@1755 256 }
jjg@1755 257
rfield@1380 258 //create the method declaration hoisting the lambda body
rfield@1380 259 JCMethodDecl lambdaDecl = make.MethodDef(make.Modifiers(sym.flags_field),
rfield@1380 260 sym.name,
rfield@1380 261 make.QualIdent(lambdaType.getReturnType().tsym),
rfield@1380 262 List.<JCTypeParameter>nil(),
rfield@1380 263 localContext.syntheticParams,
rfield@1380 264 lambdaType.getThrownTypes() == null ?
rfield@1380 265 List.<JCExpression>nil() :
rfield@1380 266 make.Types(lambdaType.getThrownTypes()),
rfield@1380 267 null,
rfield@1380 268 null);
rfield@1380 269 lambdaDecl.sym = sym;
rfield@1380 270 lambdaDecl.type = lambdaType;
rfield@1380 271
rfield@1380 272 //translate lambda body
rfield@1380 273 //As the lambda body is translated, all references to lambda locals,
rfield@1380 274 //captured variables, enclosing members are adjusted accordingly
rfield@1380 275 //to refer to the static method parameters (rather than i.e. acessing to
rfield@1380 276 //captured members directly).
rfield@1380 277 lambdaDecl.body = translate(makeLambdaBody(tree, lambdaDecl));
rfield@1380 278
rfield@1380 279 //Add the method to the list of methods to be added to this class.
rfield@1587 280 kInfo.addMethod(lambdaDecl);
rfield@1380 281
rfield@1380 282 //now that we have generated a method for the lambda expression,
rfield@1380 283 //we can translate the lambda into a method reference pointing to the newly
rfield@1380 284 //created method.
rfield@1380 285 //
rfield@1380 286 //Note that we need to adjust the method handle so that it will match the
rfield@1380 287 //signature of the SAM descriptor - this means that the method reference
rfield@1380 288 //should be added the following synthetic arguments:
rfield@1380 289 //
rfield@1380 290 // * the "this" argument if it is an instance method
rfield@1380 291 // * enclosing locals captured by the lambda expression
rfield@1380 292
rfield@1380 293 ListBuffer<JCExpression> syntheticInits = ListBuffer.lb();
rfield@1380 294
rfield@1380 295 if (!sym.isStatic()) {
rfield@1380 296 syntheticInits.append(makeThis(
rfield@1587 297 sym.owner.enclClass().asType(),
rfield@1380 298 localContext.owner.enclClass()));
rfield@1380 299 }
rfield@1380 300
rfield@1380 301 //add captured locals
rfield@1380 302 for (Symbol fv : localContext.getSymbolMap(CAPTURED_VAR).keySet()) {
rfield@1380 303 if (fv != localContext.self) {
rfield@1380 304 JCTree captured_local = make.Ident(fv).setType(fv.type);
rfield@1380 305 syntheticInits.append((JCExpression) captured_local);
rfield@1380 306 }
rfield@1380 307 }
rfield@1380 308
rfield@1380 309 //then, determine the arguments to the indy call
rfield@1380 310 List<JCExpression> indy_args = translate(syntheticInits.toList(), localContext.prev);
rfield@1380 311
rfield@1380 312 //build a sam instance using an indy call to the meta-factory
rfield@1380 313 int refKind = referenceKind(sym);
rfield@1380 314
rfield@1380 315 //convert to an invokedynamic call
rfield@1587 316 result = makeMetaFactoryIndyCall(tree, context.needsAltMetafactory(), context.isSerializable(), refKind, sym, indy_args);
rfield@1380 317 }
rfield@1380 318
rfield@1380 319 private JCIdent makeThis(Type type, Symbol owner) {
rfield@1380 320 VarSymbol _this = new VarSymbol(PARAMETER | FINAL | SYNTHETIC,
rfield@1380 321 names._this,
rfield@1380 322 type,
rfield@1380 323 owner);
rfield@1380 324 return make.Ident(_this);
rfield@1380 325 }
rfield@1380 326
rfield@1380 327 /**
rfield@1380 328 * Translate a method reference into an invokedynamic call to the
rfield@1380 329 * meta-factory.
rfield@1380 330 * @param tree
rfield@1380 331 */
rfield@1380 332 @Override
rfield@1380 333 public void visitReference(JCMemberReference tree) {
rfield@1380 334 ReferenceTranslationContext localContext = (ReferenceTranslationContext)context;
rfield@1380 335
rfield@1380 336 //first determine the method symbol to be used to generate the sam instance
rfield@1380 337 //this is either the method reference symbol, or the bridged reference symbol
rfield@1380 338 Symbol refSym = localContext.needsBridge() ?
rfield@1380 339 localContext.bridgeSym :
rfield@1380 340 tree.sym;
rfield@1380 341
rfield@1380 342 //build the bridge method, if needed
rfield@1380 343 if (localContext.needsBridge()) {
rfield@1380 344 bridgeMemberReference(tree, localContext);
rfield@1380 345 }
rfield@1380 346
rfield@1380 347 //the qualifying expression is treated as a special captured arg
rfield@1380 348 JCExpression init;
rfield@1380 349 switch(tree.kind) {
rfield@1380 350
mcimadamore@1435 351 case IMPLICIT_INNER: /** Inner :: new */
mcimadamore@1435 352 case SUPER: /** super :: instMethod */
rfield@1380 353 init = makeThis(
rfield@1587 354 localContext.owner.enclClass().asType(),
rfield@1587 355 localContext.owner.enclClass());
rfield@1380 356 break;
rfield@1380 357
mcimadamore@1435 358 case BOUND: /** Expr :: instMethod */
rfield@1380 359 init = tree.getQualifierExpression();
rfield@1380 360 break;
rfield@1380 361
mcimadamore@1435 362 case UNBOUND: /** Type :: instMethod */
mcimadamore@1435 363 case STATIC: /** Type :: staticMethod */
mcimadamore@1435 364 case TOPLEVEL: /** Top level :: new */
mcimadamore@1496 365 case ARRAY_CTOR: /** ArrayType :: new */
rfield@1380 366 init = null;
rfield@1380 367 break;
rfield@1380 368
rfield@1380 369 default:
rfield@1380 370 throw new InternalError("Should not have an invalid kind");
rfield@1380 371 }
rfield@1380 372
rfield@1380 373 List<JCExpression> indy_args = init==null? List.<JCExpression>nil() : translate(List.of(init), localContext.prev);
rfield@1380 374
rfield@1380 375
rfield@1380 376 //build a sam instance using an indy call to the meta-factory
rfield@1587 377 result = makeMetaFactoryIndyCall(tree, localContext.needsAltMetafactory(), localContext.isSerializable(), localContext.referenceKind(), refSym, indy_args);
rfield@1380 378 }
rfield@1380 379
rfield@1380 380 /**
rfield@1380 381 * Translate identifiers within a lambda to the mapped identifier
rfield@1380 382 * @param tree
rfield@1380 383 */
rfield@1380 384 @Override
rfield@1380 385 public void visitIdent(JCIdent tree) {
rfield@1380 386 if (context == null || !analyzer.lambdaIdentSymbolFilter(tree.sym)) {
rfield@1380 387 super.visitIdent(tree);
rfield@1380 388 } else {
rfield@1380 389 LambdaTranslationContext lambdaContext = (LambdaTranslationContext) context;
rfield@1380 390 if (lambdaContext.getSymbolMap(PARAM).containsKey(tree.sym)) {
rfield@1380 391 Symbol translatedSym = lambdaContext.getSymbolMap(PARAM).get(tree.sym);
rfield@1380 392 result = make.Ident(translatedSym).setType(tree.type);
jjg@1755 393 translatedSym.annotations.setTypeAttributes(tree.sym.getRawTypeAttributes());
rfield@1380 394 } else if (lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
rfield@1380 395 Symbol translatedSym = lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym);
rfield@1380 396 result = make.Ident(translatedSym).setType(tree.type);
jjg@1755 397 translatedSym.annotations.setTypeAttributes(tree.sym.getRawTypeAttributes());
rfield@1587 398 } else if (lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) {
rfield@1587 399 Symbol translatedSym = lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym);
rfield@1587 400 result = make.Ident(translatedSym).setType(translatedSym.type);
jjg@1755 401 translatedSym.annotations.setTypeAttributes(tree.sym.getRawTypeAttributes());
rfield@1380 402 } else if (lambdaContext.getSymbolMap(CAPTURED_VAR).containsKey(tree.sym)) {
rfield@1380 403 Symbol translatedSym = lambdaContext.getSymbolMap(CAPTURED_VAR).get(tree.sym);
rfield@1380 404 result = make.Ident(translatedSym).setType(tree.type);
rfield@1380 405 } else {
rfield@1380 406 //access to untranslated symbols (i.e. compile-time constants,
rfield@1380 407 //members defined inside the lambda body, etc.) )
rfield@1380 408 super.visitIdent(tree);
rfield@1380 409 }
rfield@1380 410 }
rfield@1380 411 }
rfield@1380 412
rfield@1380 413 @Override
rfield@1380 414 public void visitVarDef(JCVariableDecl tree) {
rfield@1380 415 LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context;
rfield@1380 416 if (context != null && lambdaContext.getSymbolMap(LOCAL_VAR).containsKey(tree.sym)) {
rfield@1380 417 JCExpression init = translate(tree.init);
rfield@1380 418 result = make.VarDef((VarSymbol)lambdaContext.getSymbolMap(LOCAL_VAR).get(tree.sym), init);
rfield@1587 419 } else if (context != null && lambdaContext.getSymbolMap(TYPE_VAR).containsKey(tree.sym)) {
rfield@1587 420 JCExpression init = translate(tree.init);
rfield@1587 421 VarSymbol xsym = (VarSymbol)lambdaContext.getSymbolMap(TYPE_VAR).get(tree.sym);
rfield@1587 422 result = make.VarDef(xsym, init);
rfield@1587 423 // Replace the entered symbol for this variable
rfield@1587 424 Scope sc = tree.sym.owner.members();
rfield@1587 425 if (sc != null) {
rfield@1587 426 sc.remove(tree.sym);
rfield@1587 427 sc.enter(xsym);
rfield@1587 428 }
rfield@1380 429 } else {
rfield@1380 430 super.visitVarDef(tree);
rfield@1380 431 }
rfield@1380 432 }
rfield@1380 433
rfield@1380 434 // </editor-fold>
rfield@1380 435
rfield@1380 436 // <editor-fold defaultstate="collapsed" desc="Translation helper methods">
rfield@1380 437
rfield@1380 438 private JCBlock makeLambdaBody(JCLambda tree, JCMethodDecl lambdaMethodDecl) {
rfield@1380 439 return tree.getBodyKind() == JCLambda.BodyKind.EXPRESSION ?
rfield@1380 440 makeLambdaExpressionBody((JCExpression)tree.body, lambdaMethodDecl) :
rfield@1380 441 makeLambdaStatementBody((JCBlock)tree.body, lambdaMethodDecl, tree.canCompleteNormally);
rfield@1380 442 }
rfield@1380 443
rfield@1380 444 private JCBlock makeLambdaExpressionBody(JCExpression expr, JCMethodDecl lambdaMethodDecl) {
rfield@1380 445 Type restype = lambdaMethodDecl.type.getReturnType();
rfield@1380 446 boolean isLambda_void = expr.type.hasTag(VOID);
rfield@1380 447 boolean isTarget_void = restype.hasTag(VOID);
rfield@1380 448 boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
rfield@1380 449 if (isTarget_void) {
rfield@1380 450 //target is void:
rfield@1380 451 // BODY;
rfield@1380 452 JCStatement stat = make.Exec(expr);
rfield@1380 453 return make.Block(0, List.<JCStatement>of(stat));
rfield@1380 454 } else if (isLambda_void && isTarget_Void) {
rfield@1380 455 //void to Void conversion:
rfield@1380 456 // BODY; return null;
rfield@1380 457 ListBuffer<JCStatement> stats = ListBuffer.lb();
rfield@1380 458 stats.append(make.Exec(expr));
rfield@1380 459 stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
rfield@1380 460 return make.Block(0, stats.toList());
rfield@1380 461 } else {
rfield@1380 462 //non-void to non-void conversion:
rfield@1380 463 // return (TYPE)BODY;
rfield@1380 464 JCExpression retExpr = transTypes.coerce(attrEnv, expr, restype);
rfield@1380 465 return make.Block(0, List.<JCStatement>of(make.Return(retExpr)));
rfield@1380 466 }
rfield@1380 467 }
rfield@1380 468
rfield@1380 469 private JCBlock makeLambdaStatementBody(JCBlock block, final JCMethodDecl lambdaMethodDecl, boolean completeNormally) {
rfield@1380 470 final Type restype = lambdaMethodDecl.type.getReturnType();
rfield@1380 471 final boolean isTarget_void = restype.hasTag(VOID);
rfield@1380 472 boolean isTarget_Void = types.isSameType(restype, types.boxedClass(syms.voidType).type);
rfield@1380 473
rfield@1380 474 class LambdaBodyTranslator extends TreeTranslator {
rfield@1380 475
rfield@1380 476 @Override
rfield@1380 477 public void visitClassDef(JCClassDecl tree) {
rfield@1380 478 //do NOT recurse on any inner classes
rfield@1380 479 result = tree;
rfield@1380 480 }
rfield@1380 481
rfield@1380 482 @Override
rfield@1380 483 public void visitLambda(JCLambda tree) {
rfield@1380 484 //do NOT recurse on any nested lambdas
rfield@1380 485 result = tree;
rfield@1380 486 }
rfield@1380 487
rfield@1380 488 @Override
rfield@1380 489 public void visitReturn(JCReturn tree) {
rfield@1380 490 boolean isLambda_void = tree.expr == null;
rfield@1380 491 if (isTarget_void && !isLambda_void) {
rfield@1380 492 //Void to void conversion:
rfield@1380 493 // { TYPE $loc = RET-EXPR; return; }
rfield@1380 494 VarSymbol loc = makeSyntheticVar(0, names.fromString("$loc"), tree.expr.type, lambdaMethodDecl.sym);
rfield@1380 495 JCVariableDecl varDef = make.VarDef(loc, tree.expr);
rfield@1380 496 result = make.Block(0, List.<JCStatement>of(varDef, make.Return(null)));
rfield@1380 497 } else if (!isTarget_void || !isLambda_void) {
rfield@1380 498 //non-void to non-void conversion:
rfield@1380 499 // return (TYPE)RET-EXPR;
rfield@1380 500 tree.expr = transTypes.coerce(attrEnv, tree.expr, restype);
rfield@1380 501 result = tree;
rfield@1380 502 } else {
rfield@1380 503 result = tree;
rfield@1380 504 }
rfield@1380 505
rfield@1380 506 }
rfield@1380 507 }
rfield@1380 508
rfield@1380 509 JCBlock trans_block = new LambdaBodyTranslator().translate(block);
rfield@1380 510 if (completeNormally && isTarget_Void) {
rfield@1380 511 //there's no return statement and the lambda (possibly inferred)
rfield@1380 512 //return type is java.lang.Void; emit a synthetic return statement
rfield@1380 513 trans_block.stats = trans_block.stats.append(make.Return(make.Literal(BOT, null).setType(syms.botType)));
rfield@1380 514 }
rfield@1380 515 return trans_block;
rfield@1380 516 }
rfield@1380 517
rfield@1587 518 private JCMethodDecl makeDeserializeMethod(Symbol kSym) {
rfield@1587 519 ListBuffer<JCCase> cases = ListBuffer.lb();
rfield@1587 520 ListBuffer<JCBreak> breaks = ListBuffer.lb();
rfield@1587 521 for (Map.Entry<String, ListBuffer<JCStatement>> entry : kInfo.deserializeCases.entrySet()) {
rfield@1587 522 JCBreak br = make.Break(null);
rfield@1587 523 breaks.add(br);
rfield@1587 524 List<JCStatement> stmts = entry.getValue().append(br).toList();
rfield@1587 525 cases.add(make.Case(make.Literal(entry.getKey()), stmts));
rfield@1587 526 }
rfield@1587 527 JCSwitch sw = make.Switch(deserGetter("getImplMethodName", syms.stringType), cases.toList());
rfield@1587 528 for (JCBreak br : breaks) {
rfield@1587 529 br.target = sw;
rfield@1587 530 }
rfield@1587 531 JCBlock body = make.Block(0L, List.<JCStatement>of(
rfield@1587 532 sw,
rfield@1587 533 make.Throw(makeNewClass(
rfield@1587 534 syms.illegalArgumentExceptionType,
rfield@1587 535 List.<JCExpression>of(make.Literal("Invalid lambda deserialization"))))));
rfield@1587 536 JCMethodDecl deser = make.MethodDef(make.Modifiers(kInfo.deserMethodSym.flags()),
rfield@1587 537 names.deserializeLambda,
rfield@1587 538 make.QualIdent(kInfo.deserMethodSym.getReturnType().tsym),
rfield@1587 539 List.<JCTypeParameter>nil(),
rfield@1587 540 List.of(make.VarDef(kInfo.deserParamSym, null)),
rfield@1587 541 List.<JCExpression>nil(),
rfield@1587 542 body,
rfield@1587 543 null);
rfield@1587 544 deser.sym = kInfo.deserMethodSym;
rfield@1587 545 deser.type = kInfo.deserMethodSym.type;
rfield@1587 546 //System.err.printf("DESER: '%s'\n", deser);
rfield@1587 547 return deser;
rfield@1587 548 }
rfield@1587 549
rfield@1587 550 /** Make an attributed class instance creation expression.
rfield@1587 551 * @param ctype The class type.
rfield@1587 552 * @param args The constructor arguments.
rfield@1717 553 * @param cons The constructor symbol
rfield@1587 554 */
rfield@1717 555 JCNewClass makeNewClass(Type ctype, List<JCExpression> args, Symbol cons) {
rfield@1587 556 JCNewClass tree = make.NewClass(null,
rfield@1587 557 null, make.QualIdent(ctype.tsym), args, null);
rfield@1717 558 tree.constructor = cons;
rfield@1587 559 tree.type = ctype;
rfield@1587 560 return tree;
rfield@1587 561 }
rfield@1587 562
rfield@1717 563 /** Make an attributed class instance creation expression.
rfield@1717 564 * @param ctype The class type.
rfield@1717 565 * @param args The constructor arguments.
rfield@1717 566 */
rfield@1717 567 JCNewClass makeNewClass(Type ctype, List<JCExpression> args) {
rfield@1717 568 return makeNewClass(ctype, args,
rfield@1717 569 rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.<Type>nil()));
rfield@1717 570 }
rfield@1717 571
rfield@1587 572 private void addDeserializationCase(int implMethodKind, Symbol refSym, Type targetType, MethodSymbol samSym,
rfield@1587 573 DiagnosticPosition pos, List<Object> staticArgs, MethodType indyType) {
rfield@1587 574 String functionalInterfaceClass = classSig(targetType);
rfield@1587 575 String functionalInterfaceMethodName = samSym.getSimpleName().toString();
rfield@1587 576 String functionalInterfaceMethodSignature = methodSig(types.erasure(samSym.type));
rfield@1622 577 String implClass = classSig(types.erasure(refSym.owner.type));
rfield@1587 578 String implMethodName = refSym.getQualifiedName().toString();
rfield@1587 579 String implMethodSignature = methodSig(types.erasure(refSym.type));
rfield@1587 580
rfield@1587 581 JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType), make.Literal(implMethodKind));
rfield@1587 582 ListBuffer<JCExpression> serArgs = ListBuffer.lb();
rfield@1587 583 int i = 0;
rfield@1587 584 for (Type t : indyType.getParameterTypes()) {
rfield@1587 585 List<JCExpression> indexAsArg = ListBuffer.<JCExpression>lb().append(make.Literal(i)).toList();
rfield@1587 586 List<Type> argTypes = ListBuffer.<Type>lb().append(syms.intType).toList();
rfield@1587 587 serArgs.add(make.TypeCast(types.erasure(t), deserGetter("getCapturedArg", syms.objectType, argTypes, indexAsArg)));
rfield@1587 588 ++i;
rfield@1587 589 }
rfield@1587 590 JCStatement stmt = make.If(
rfield@1587 591 deserTest(deserTest(deserTest(deserTest(deserTest(
rfield@1587 592 kindTest,
rfield@1587 593 "getFunctionalInterfaceClass", functionalInterfaceClass),
rfield@1587 594 "getFunctionalInterfaceMethodName", functionalInterfaceMethodName),
rfield@1587 595 "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature),
rfield@1587 596 "getImplClass", implClass),
rfield@1587 597 "getImplMethodSignature", implMethodSignature),
rfield@1587 598 make.Return(makeIndyCall(
rfield@1587 599 pos,
rfield@1587 600 syms.lambdaMetafactory,
rfield@1587 601 names.altMetaFactory,
rfield@1587 602 staticArgs, indyType, serArgs.toList())),
rfield@1587 603 null);
rfield@1587 604 ListBuffer<JCStatement> stmts = kInfo.deserializeCases.get(implMethodName);
rfield@1587 605 if (stmts == null) {
rfield@1587 606 stmts = ListBuffer.lb();
rfield@1587 607 kInfo.deserializeCases.put(implMethodName, stmts);
rfield@1587 608 }
rfield@1587 609 /****
rfield@1587 610 System.err.printf("+++++++++++++++++\n");
rfield@1587 611 System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass);
rfield@1587 612 System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName);
rfield@1587 613 System.err.printf("*functionalInterfaceMethodSignature: '%s'\n", functionalInterfaceMethodSignature);
rfield@1587 614 System.err.printf("*implMethodKind: %d\n", implMethodKind);
rfield@1587 615 System.err.printf("*implClass: '%s'\n", implClass);
rfield@1587 616 System.err.printf("*implMethodName: '%s'\n", implMethodName);
rfield@1587 617 System.err.printf("*implMethodSignature: '%s'\n", implMethodSignature);
rfield@1587 618 ****/
rfield@1587 619 stmts.append(stmt);
rfield@1587 620 }
rfield@1587 621
rfield@1587 622 private JCExpression eqTest(Type argType, JCExpression arg1, JCExpression arg2) {
rfield@1587 623 JCBinary testExpr = make.Binary(JCTree.Tag.EQ, arg1, arg2);
rfield@1587 624 testExpr.operator = rs.resolveBinaryOperator(null, JCTree.Tag.EQ, attrEnv, argType, argType);
rfield@1587 625 testExpr.setType(syms.booleanType);
rfield@1587 626 return testExpr;
rfield@1587 627 }
rfield@1587 628
rfield@1587 629 private JCExpression deserTest(JCExpression prev, String func, String lit) {
rfield@1587 630 MethodType eqmt = new MethodType(List.of(syms.objectType), syms.booleanType, List.<Type>nil(), syms.methodClass);
rfield@1587 631 Symbol eqsym = rs.resolveQualifiedMethod(null, attrEnv, syms.objectType, names.equals, List.of(syms.objectType), List.<Type>nil());
rfield@1587 632 JCMethodInvocation eqtest = make.Apply(
rfield@1587 633 List.<JCExpression>nil(),
rfield@1587 634 make.Select(deserGetter(func, syms.stringType), eqsym).setType(eqmt),
rfield@1587 635 List.<JCExpression>of(make.Literal(lit)));
rfield@1587 636 eqtest.setType(syms.booleanType);
rfield@1587 637 JCBinary compound = make.Binary(JCTree.Tag.AND, prev, eqtest);
rfield@1587 638 compound.operator = rs.resolveBinaryOperator(null, JCTree.Tag.AND, attrEnv, syms.booleanType, syms.booleanType);
rfield@1587 639 compound.setType(syms.booleanType);
rfield@1587 640 return compound;
rfield@1587 641 }
rfield@1587 642
rfield@1587 643 private JCExpression deserGetter(String func, Type type) {
rfield@1587 644 return deserGetter(func, type, List.<Type>nil(), List.<JCExpression>nil());
rfield@1587 645 }
rfield@1587 646
rfield@1587 647 private JCExpression deserGetter(String func, Type type, List<Type> argTypes, List<JCExpression> args) {
rfield@1587 648 MethodType getmt = new MethodType(argTypes, type, List.<Type>nil(), syms.methodClass);
rfield@1587 649 Symbol getsym = rs.resolveQualifiedMethod(null, attrEnv, syms.serializedLambdaType, names.fromString(func), argTypes, List.<Type>nil());
rfield@1587 650 return make.Apply(
rfield@1587 651 List.<JCExpression>nil(),
rfield@1587 652 make.Select(make.Ident(kInfo.deserParamSym).setType(syms.serializedLambdaType), getsym).setType(getmt),
rfield@1587 653 args).setType(type);
rfield@1587 654 }
rfield@1587 655
rfield@1380 656 /**
rfield@1380 657 * Create new synthetic method with given flags, name, type, owner
rfield@1380 658 */
rfield@1380 659 private MethodSymbol makeSyntheticMethod(long flags, Name name, Type type, Symbol owner) {
rfield@1380 660 return new MethodSymbol(flags | SYNTHETIC, name, type, owner);
rfield@1380 661 }
rfield@1380 662
rfield@1380 663 /**
rfield@1380 664 * Create new synthetic variable with given flags, name, type, owner
rfield@1380 665 */
rfield@1380 666 private VarSymbol makeSyntheticVar(long flags, String name, Type type, Symbol owner) {
rfield@1380 667 return makeSyntheticVar(flags, names.fromString(name), type, owner);
rfield@1380 668 }
rfield@1380 669
rfield@1380 670 /**
rfield@1380 671 * Create new synthetic variable with given flags, name, type, owner
rfield@1380 672 */
rfield@1380 673 private VarSymbol makeSyntheticVar(long flags, Name name, Type type, Symbol owner) {
rfield@1380 674 return new VarSymbol(flags | SYNTHETIC, name, type, owner);
rfield@1380 675 }
rfield@1380 676
rfield@1380 677 /**
rfield@1380 678 * Set varargsElement field on a given tree (must be either a new class tree
rfield@1380 679 * or a method call tree)
rfield@1380 680 */
rfield@1380 681 private void setVarargsIfNeeded(JCTree tree, Type varargsElement) {
rfield@1380 682 if (varargsElement != null) {
rfield@1380 683 switch (tree.getTag()) {
rfield@1380 684 case APPLY: ((JCMethodInvocation)tree).varargsElement = varargsElement; break;
rfield@1380 685 case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break;
rfield@1380 686 default: throw new AssertionError();
rfield@1380 687 }
rfield@1380 688 }
rfield@1380 689 }
rfield@1380 690
rfield@1380 691 /**
rfield@1380 692 * Convert method/constructor arguments by inserting appropriate cast
rfield@1380 693 * as required by type-erasure - this is needed when bridging a lambda/method
rfield@1380 694 * reference, as the bridged signature might require downcast to be compatible
rfield@1380 695 * with the generated signature.
rfield@1380 696 */
rfield@1380 697 private List<JCExpression> convertArgs(Symbol meth, List<JCExpression> args, Type varargsElement) {
rfield@1380 698 Assert.check(meth.kind == Kinds.MTH);
rfield@1380 699 List<Type> formals = types.erasure(meth.type).getParameterTypes();
rfield@1380 700 if (varargsElement != null) {
rfield@1380 701 Assert.check((meth.flags() & VARARGS) != 0);
rfield@1380 702 }
rfield@1380 703 return transTypes.translateArgs(args, formals, varargsElement, attrEnv);
rfield@1380 704 }
rfield@1380 705
rfield@1380 706 // </editor-fold>
rfield@1380 707
rfield@1380 708 /**
rfield@1380 709 * Generate an adapter method "bridge" for a method reference which cannot
rfield@1380 710 * be used directly.
rfield@1380 711 */
rfield@1380 712 private class MemberReferenceBridger {
rfield@1380 713
rfield@1380 714 private final JCMemberReference tree;
rfield@1380 715 private final ReferenceTranslationContext localContext;
rfield@1380 716 private final ListBuffer<JCExpression> args = ListBuffer.lb();
rfield@1380 717 private final ListBuffer<JCVariableDecl> params = ListBuffer.lb();
rfield@1380 718
rfield@1380 719 MemberReferenceBridger(JCMemberReference tree, ReferenceTranslationContext localContext) {
rfield@1380 720 this.tree = tree;
rfield@1380 721 this.localContext = localContext;
rfield@1380 722 }
rfield@1380 723
rfield@1380 724 /**
rfield@1380 725 * Generate the bridge
rfield@1380 726 */
rfield@1380 727 JCMethodDecl bridge() {
rfield@1380 728 int prevPos = make.pos;
rfield@1380 729 try {
rfield@1380 730 make.at(tree);
rfield@1380 731 Type samDesc = localContext.bridgedRefSig();
rfield@1380 732 List<Type> samPTypes = samDesc.getParameterTypes();
rfield@1380 733
rfield@1380 734 //an extra argument is prepended to the signature of the bridge in case
rfield@1380 735 //the member reference is an instance method reference (in which case
rfield@1380 736 //the receiver expression is passed to the bridge itself).
rfield@1380 737 Type recType = null;
rfield@1380 738 switch (tree.kind) {
rfield@1380 739 case IMPLICIT_INNER:
rfield@1380 740 recType = tree.sym.owner.type.getEnclosingType();
rfield@1380 741 break;
rfield@1380 742 case BOUND:
rfield@1380 743 recType = tree.getQualifierExpression().type;
rfield@1380 744 break;
rfield@1380 745 case UNBOUND:
rfield@1380 746 recType = samPTypes.head;
rfield@1380 747 samPTypes = samPTypes.tail;
rfield@1380 748 break;
rfield@1380 749 }
rfield@1380 750
rfield@1380 751 //generate the parameter list for the bridged member reference - the
rfield@1380 752 //bridge signature will match the signature of the target sam descriptor
rfield@1380 753
rfield@1380 754 VarSymbol rcvr = (recType == null)
rfield@1380 755 ? null
rfield@1380 756 : addParameter("rec$", recType, false);
rfield@1380 757
rfield@1380 758 List<Type> refPTypes = tree.sym.type.getParameterTypes();
rfield@1380 759 int refSize = refPTypes.size();
rfield@1380 760 int samSize = samPTypes.size();
mcimadamore@1595 761 // Last parameter to copy from referenced method
mcimadamore@1595 762 int last = localContext.needsVarArgsConversion() ? refSize - 1 : refSize;
rfield@1380 763
rfield@1380 764 List<Type> l = refPTypes;
rfield@1380 765 // Use parameter types of the referenced method, excluding final var args
rfield@1380 766 for (int i = 0; l.nonEmpty() && i < last; ++i) {
rfield@1380 767 addParameter("x$" + i, l.head, true);
rfield@1380 768 l = l.tail;
rfield@1380 769 }
rfield@1380 770 // Flatten out the var args
rfield@1380 771 for (int i = last; i < samSize; ++i) {
rfield@1380 772 addParameter("xva$" + i, tree.varargsElement, true);
rfield@1380 773 }
rfield@1380 774
rfield@1380 775 //generate the bridge method declaration
rfield@1380 776 JCMethodDecl bridgeDecl = make.MethodDef(make.Modifiers(localContext.bridgeSym.flags()),
rfield@1380 777 localContext.bridgeSym.name,
rfield@1380 778 make.QualIdent(samDesc.getReturnType().tsym),
rfield@1380 779 List.<JCTypeParameter>nil(),
rfield@1380 780 params.toList(),
rfield@1380 781 tree.sym.type.getThrownTypes() == null
rfield@1380 782 ? List.<JCExpression>nil()
rfield@1380 783 : make.Types(tree.sym.type.getThrownTypes()),
rfield@1380 784 null,
rfield@1380 785 null);
rfield@1380 786 bridgeDecl.sym = (MethodSymbol) localContext.bridgeSym;
mcimadamore@1595 787 bridgeDecl.type = localContext.bridgeSym.type =
mcimadamore@1595 788 types.createMethodTypeWithParameters(samDesc, TreeInfo.types(params.toList()));
rfield@1380 789
rfield@1380 790 //bridge method body generation - this can be either a method call or a
rfield@1380 791 //new instance creation expression, depending on the member reference kind
rfield@1380 792 JCExpression bridgeExpr = (tree.getMode() == ReferenceMode.INVOKE)
mcimadamore@1614 793 ? bridgeExpressionInvoke(makeReceiver(rcvr))
rfield@1380 794 : bridgeExpressionNew();
rfield@1380 795
rfield@1380 796 //the body is either a return expression containing a method call,
rfield@1380 797 //or the method call itself, depending on whether the return type of
rfield@1380 798 //the bridge is non-void/void.
rfield@1380 799 bridgeDecl.body = makeLambdaExpressionBody(bridgeExpr, bridgeDecl);
rfield@1380 800
rfield@1380 801 return bridgeDecl;
rfield@1380 802 } finally {
rfield@1380 803 make.at(prevPos);
rfield@1380 804 }
rfield@1380 805 }
mcimadamore@1614 806 //where
mcimadamore@1614 807 private JCExpression makeReceiver(VarSymbol rcvr) {
mcimadamore@1614 808 if (rcvr == null) return null;
mcimadamore@1614 809 JCExpression rcvrExpr = make.Ident(rcvr);
mcimadamore@1614 810 Type rcvrType = tree.sym.enclClass().type;
mcimadamore@1614 811 if (!rcvr.type.tsym.isSubClass(rcvrType.tsym, types)) {
mcimadamore@1614 812 rcvrExpr = make.TypeCast(make.Type(rcvrType), rcvrExpr).setType(rcvrType);
mcimadamore@1614 813 }
mcimadamore@1614 814 return rcvrExpr;
mcimadamore@1614 815 }
rfield@1380 816
rfield@1380 817 /**
rfield@1380 818 * determine the receiver of the bridged method call - the receiver can
rfield@1380 819 * be either the synthetic receiver parameter or a type qualifier; the
rfield@1380 820 * original qualifier expression is never used here, as it might refer
rfield@1380 821 * to symbols not available in the static context of the bridge
rfield@1380 822 */
mcimadamore@1614 823 private JCExpression bridgeExpressionInvoke(JCExpression rcvr) {
rfield@1380 824 JCExpression qualifier =
rfield@1380 825 tree.sym.isStatic() ?
rfield@1380 826 make.Type(tree.sym.owner.type) :
rfield@1380 827 (rcvr != null) ?
mcimadamore@1614 828 rcvr :
rfield@1380 829 tree.getQualifierExpression();
rfield@1380 830
rfield@1380 831 //create the qualifier expression
rfield@1380 832 JCFieldAccess select = make.Select(qualifier, tree.sym.name);
rfield@1380 833 select.sym = tree.sym;
rfield@1380 834 select.type = tree.sym.erasure(types);
rfield@1380 835
rfield@1380 836 //create the method call expression
rfield@1380 837 JCExpression apply = make.Apply(List.<JCExpression>nil(), select,
mcimadamore@1595 838 convertArgs(tree.sym, args.toList(), tree.varargsElement)).
mcimadamore@1595 839 setType(tree.sym.erasure(types).getReturnType());
rfield@1380 840
rfield@1380 841 apply = transTypes.coerce(apply, localContext.generatedRefSig().getReturnType());
rfield@1380 842 setVarargsIfNeeded(apply, tree.varargsElement);
rfield@1380 843 return apply;
rfield@1380 844 }
rfield@1380 845
rfield@1380 846 /**
rfield@1380 847 * the enclosing expression is either 'null' (no enclosing type) or set
rfield@1380 848 * to the first bridge synthetic parameter
rfield@1380 849 */
rfield@1380 850 private JCExpression bridgeExpressionNew() {
mcimadamore@1496 851 if (tree.kind == ReferenceKind.ARRAY_CTOR) {
mcimadamore@1496 852 //create the array creation expression
mcimadamore@1595 853 JCNewArray newArr = make.NewArray(
mcimadamore@1595 854 make.Type(types.elemtype(tree.getQualifierExpression().type)),
mcimadamore@1496 855 List.of(make.Ident(params.first())),
mcimadamore@1496 856 null);
mcimadamore@1496 857 newArr.type = tree.getQualifierExpression().type;
mcimadamore@1496 858 return newArr;
mcimadamore@1496 859 } else {
mcimadamore@1496 860 JCExpression encl = null;
mcimadamore@1496 861 switch (tree.kind) {
mcimadamore@1496 862 case UNBOUND:
mcimadamore@1496 863 case IMPLICIT_INNER:
mcimadamore@1496 864 encl = make.Ident(params.first());
mcimadamore@1496 865 }
mcimadamore@1496 866
mcimadamore@1496 867 //create the instance creation expression
mcimadamore@1496 868 JCNewClass newClass = make.NewClass(encl,
mcimadamore@1496 869 List.<JCExpression>nil(),
mcimadamore@1496 870 make.Type(tree.getQualifierExpression().type),
mcimadamore@1496 871 convertArgs(tree.sym, args.toList(), tree.varargsElement),
mcimadamore@1496 872 null);
mcimadamore@1496 873 newClass.constructor = tree.sym;
mcimadamore@1496 874 newClass.constructorType = tree.sym.erasure(types);
mcimadamore@1496 875 newClass.type = tree.getQualifierExpression().type;
mcimadamore@1496 876 setVarargsIfNeeded(newClass, tree.varargsElement);
mcimadamore@1496 877 return newClass;
rfield@1380 878 }
rfield@1380 879 }
rfield@1380 880
rfield@1380 881 private VarSymbol addParameter(String name, Type p, boolean genArg) {
rfield@1380 882 VarSymbol vsym = new VarSymbol(0, names.fromString(name), p, localContext.bridgeSym);
rfield@1380 883 params.append(make.VarDef(vsym, null));
rfield@1380 884 if (genArg) {
rfield@1380 885 args.append(make.Ident(vsym));
rfield@1380 886 }
rfield@1380 887 return vsym;
rfield@1380 888 }
rfield@1380 889 }
rfield@1380 890
rfield@1380 891 /**
rfield@1380 892 * Bridges a member reference - this is needed when:
rfield@1380 893 * * Var args in the referenced method need to be flattened away
rfield@1380 894 * * super is used
rfield@1380 895 */
rfield@1380 896 private void bridgeMemberReference(JCMemberReference tree, ReferenceTranslationContext localContext) {
rfield@1587 897 kInfo.addMethod(new MemberReferenceBridger(tree, localContext).bridge());
rfield@1380 898 }
rfield@1380 899
rfield@1380 900 /**
rfield@1380 901 * Generate an indy method call to the meta factory
rfield@1380 902 */
rfield@1587 903 private JCExpression makeMetaFactoryIndyCall(JCFunctionalExpression tree, boolean needsAltMetafactory,
rfield@1587 904 boolean isSerializable, int refKind, Symbol refSym, List<JCExpression> indy_args) {
rfield@1380 905 //determine the static bsm args
mcimadamore@1510 906 Type mtype = types.erasure(tree.descriptorType);
mcimadamore@1510 907 MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.type.tsym);
rfield@1380 908 List<Object> staticArgs = List.<Object>of(
mcimadamore@1595 909 new Pool.MethodHandle(ClassFile.REF_invokeInterface,
mcimadamore@1595 910 types.findDescriptorSymbol(tree.type.tsym), types),
vromero@1452 911 new Pool.MethodHandle(refKind, refSym, types),
rfield@1380 912 new MethodType(mtype.getParameterTypes(),
rfield@1380 913 mtype.getReturnType(),
rfield@1380 914 mtype.getThrownTypes(),
rfield@1380 915 syms.methodClass));
rfield@1380 916
rfield@1380 917 //computed indy arg types
rfield@1380 918 ListBuffer<Type> indy_args_types = ListBuffer.lb();
rfield@1380 919 for (JCExpression arg : indy_args) {
rfield@1380 920 indy_args_types.append(arg.type);
rfield@1380 921 }
rfield@1380 922
rfield@1380 923 //finally, compute the type of the indy call
rfield@1380 924 MethodType indyType = new MethodType(indy_args_types.toList(),
rfield@1380 925 tree.type,
rfield@1380 926 List.<Type>nil(),
rfield@1380 927 syms.methodClass);
rfield@1380 928
rfield@1587 929 Name metafactoryName = needsAltMetafactory ?
rfield@1587 930 names.altMetaFactory : names.metaFactory;
rfield@1587 931
rfield@1587 932 if (needsAltMetafactory) {
rfield@1587 933 ListBuffer<Object> markers = ListBuffer.lb();
rfield@1587 934 for (Symbol t : tree.targets.tail) {
rfield@1587 935 if (t != syms.serializableType.tsym) {
rfield@1587 936 markers.append(t);
rfield@1587 937 }
rfield@1587 938 }
rfield@1587 939 int flags = isSerializable? FLAG_SERIALIZABLE : 0;
rfield@1587 940 boolean hasMarkers = markers.nonEmpty();
rfield@1587 941 flags |= hasMarkers ? FLAG_MARKERS : 0;
rfield@1587 942 staticArgs = staticArgs.append(flags);
rfield@1587 943 if (hasMarkers) {
rfield@1587 944 staticArgs = staticArgs.append(markers.length());
rfield@1587 945 staticArgs = staticArgs.appendList(markers.toList());
rfield@1587 946 }
rfield@1587 947 if (isSerializable) {
rfield@1587 948 addDeserializationCase(refKind, refSym, tree.type, samSym,
rfield@1587 949 tree, staticArgs, indyType);
rfield@1587 950 }
rfield@1587 951 }
rfield@1587 952
rfield@1587 953 return makeIndyCall(tree, syms.lambdaMetafactory, metafactoryName, staticArgs, indyType, indy_args);
rfield@1380 954 }
rfield@1380 955
rfield@1380 956 /**
rfield@1380 957 * Generate an indy method call with given name, type and static bootstrap
rfield@1380 958 * arguments types
rfield@1380 959 */
mcimadamore@1595 960 private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmName,
mcimadamore@1595 961 List<Object> staticArgs, MethodType indyType, List<JCExpression> indyArgs) {
rfield@1380 962 int prevPos = make.pos;
rfield@1380 963 try {
rfield@1380 964 make.at(pos);
rfield@1380 965 List<Type> bsm_staticArgs = List.of(syms.methodHandleLookupType,
rfield@1380 966 syms.stringType,
rfield@1380 967 syms.methodTypeType).appendList(bsmStaticArgToTypes(staticArgs));
rfield@1380 968
rfield@1380 969 Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site,
rfield@1380 970 bsmName, bsm_staticArgs, List.<Type>nil());
rfield@1380 971
rfield@1380 972 DynamicMethodSymbol dynSym =
rfield@1380 973 new DynamicMethodSymbol(names.lambda,
rfield@1380 974 syms.noSymbol,
mcimadamore@1595 975 bsm.isStatic() ?
mcimadamore@1595 976 ClassFile.REF_invokeStatic :
mcimadamore@1595 977 ClassFile.REF_invokeVirtual,
rfield@1380 978 (MethodSymbol)bsm,
rfield@1380 979 indyType,
rfield@1380 980 staticArgs.toArray());
rfield@1380 981
rfield@1380 982 JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName);
rfield@1380 983 qualifier.sym = dynSym;
rfield@1380 984 qualifier.type = indyType.getReturnType();
rfield@1380 985
rfield@1380 986 JCMethodInvocation proxyCall = make.Apply(List.<JCExpression>nil(), qualifier, indyArgs);
rfield@1380 987 proxyCall.type = indyType.getReturnType();
rfield@1380 988 return proxyCall;
rfield@1380 989 } finally {
rfield@1380 990 make.at(prevPos);
rfield@1380 991 }
rfield@1380 992 }
rfield@1380 993 //where
rfield@1380 994 private List<Type> bsmStaticArgToTypes(List<Object> args) {
rfield@1380 995 ListBuffer<Type> argtypes = ListBuffer.lb();
rfield@1380 996 for (Object arg : args) {
rfield@1380 997 argtypes.append(bsmStaticArgToType(arg));
rfield@1380 998 }
rfield@1380 999 return argtypes.toList();
rfield@1380 1000 }
rfield@1380 1001
rfield@1380 1002 private Type bsmStaticArgToType(Object arg) {
rfield@1380 1003 Assert.checkNonNull(arg);
rfield@1380 1004 if (arg instanceof ClassSymbol) {
rfield@1380 1005 return syms.classType;
rfield@1380 1006 } else if (arg instanceof Integer) {
rfield@1380 1007 return syms.intType;
rfield@1380 1008 } else if (arg instanceof Long) {
rfield@1380 1009 return syms.longType;
rfield@1380 1010 } else if (arg instanceof Float) {
rfield@1380 1011 return syms.floatType;
rfield@1380 1012 } else if (arg instanceof Double) {
rfield@1380 1013 return syms.doubleType;
rfield@1380 1014 } else if (arg instanceof String) {
rfield@1380 1015 return syms.stringType;
rfield@1380 1016 } else if (arg instanceof Pool.MethodHandle) {
rfield@1380 1017 return syms.methodHandleType;
rfield@1380 1018 } else if (arg instanceof MethodType) {
rfield@1380 1019 return syms.methodTypeType;
rfield@1380 1020 } else {
rfield@1380 1021 Assert.error("bad static arg " + arg.getClass());
rfield@1380 1022 return null;
rfield@1380 1023 }
rfield@1380 1024 }
rfield@1380 1025
rfield@1380 1026 /**
rfield@1380 1027 * Get the opcode associated with this method reference
rfield@1380 1028 */
rfield@1380 1029 private int referenceKind(Symbol refSym) {
rfield@1380 1030 if (refSym.isConstructor()) {
rfield@1380 1031 return ClassFile.REF_newInvokeSpecial;
rfield@1380 1032 } else {
rfield@1380 1033 if (refSym.isStatic()) {
rfield@1380 1034 return ClassFile.REF_invokeStatic;
rfield@1380 1035 } else if (refSym.enclClass().isInterface()) {
rfield@1380 1036 return ClassFile.REF_invokeInterface;
rfield@1380 1037 } else {
mcimadamore@1652 1038 return (refSym.flags() & PRIVATE) != 0 ?
mcimadamore@1652 1039 ClassFile.REF_invokeSpecial :
mcimadamore@1652 1040 ClassFile.REF_invokeVirtual;
rfield@1380 1041 }
rfield@1380 1042 }
rfield@1380 1043 }
rfield@1587 1044
mcimadamore@1652 1045 // <editor-fold defaultstate="collapsed" desc="Lambda/reference analyzer">
rfield@1380 1046 /**
rfield@1380 1047 * This visitor collects information about translation of a lambda expression.
rfield@1380 1048 * More specifically, it keeps track of the enclosing contexts and captured locals
rfield@1380 1049 * accessed by the lambda being translated (as well as other useful info).
rfield@1717 1050 * It also translates away problems for LambdaToMethod.
rfield@1380 1051 */
rfield@1717 1052 class LambdaAnalyzerPreprocessor extends TreeTranslator {
rfield@1380 1053
rfield@1380 1054 /** the frame stack - used to reconstruct translation info about enclosing scopes */
rfield@1380 1055 private List<Frame> frameStack;
rfield@1380 1056
rfield@1380 1057 /**
rfield@1380 1058 * keep the count of lambda expression (used to generate unambiguous
rfield@1380 1059 * names)
rfield@1380 1060 */
rfield@1380 1061 private int lambdaCount = 0;
rfield@1380 1062
rfield@1587 1063 /**
rfield@1587 1064 * keep the count of lambda expression defined in given context (used to
rfield@1587 1065 * generate unambiguous names for serializable lambdas)
rfield@1587 1066 */
rfield@1587 1067 private Map<String, Integer> serializableLambdaCounts =
rfield@1587 1068 new HashMap<String, Integer>();
rfield@1587 1069
mcimadamore@1612 1070 private Map<Symbol, JCClassDecl> localClassDefs;
mcimadamore@1612 1071
rfield@1587 1072 /**
rfield@1587 1073 * maps for fake clinit symbols to be used as owners of lambda occurring in
rfield@1587 1074 * a static var init context
rfield@1587 1075 */
rfield@1587 1076 private Map<ClassSymbol, Symbol> clinits =
rfield@1587 1077 new HashMap<ClassSymbol, Symbol>();
rfield@1587 1078
rfield@1717 1079 private JCClassDecl analyzeAndPreprocessClass(JCClassDecl tree) {
rfield@1380 1080 frameStack = List.nil();
mcimadamore@1612 1081 localClassDefs = new HashMap<Symbol, JCClassDecl>();
rfield@1717 1082 return translate(tree);
rfield@1380 1083 }
rfield@1380 1084
rfield@1380 1085 @Override
rfield@1380 1086 public void visitBlock(JCBlock tree) {
rfield@1380 1087 List<Frame> prevStack = frameStack;
rfield@1380 1088 try {
rfield@1380 1089 if (frameStack.nonEmpty() && frameStack.head.tree.hasTag(CLASSDEF)) {
rfield@1380 1090 frameStack = frameStack.prepend(new Frame(tree));
rfield@1380 1091 }
rfield@1380 1092 super.visitBlock(tree);
rfield@1380 1093 }
rfield@1380 1094 finally {
rfield@1380 1095 frameStack = prevStack;
rfield@1380 1096 }
rfield@1380 1097 }
rfield@1380 1098
rfield@1380 1099 @Override
rfield@1380 1100 public void visitClassDef(JCClassDecl tree) {
rfield@1380 1101 List<Frame> prevStack = frameStack;
mcimadamore@1595 1102 Map<String, Integer> prevSerializableLambdaCount =
mcimadamore@1595 1103 serializableLambdaCounts;
rfield@1587 1104 Map<ClassSymbol, Symbol> prevClinits = clinits;
rfield@1380 1105 try {
rfield@1587 1106 serializableLambdaCounts = new HashMap<String, Integer>();
rfield@1587 1107 prevClinits = new HashMap<ClassSymbol, Symbol>();
mcimadamore@1612 1108 if (tree.sym.owner.kind == MTH) {
mcimadamore@1612 1109 localClassDefs.put(tree.sym, tree);
mcimadamore@1612 1110 }
rfield@1587 1111 if (directlyEnclosingLambda() != null) {
rfield@1380 1112 tree.sym.owner = owner();
mcimadamore@1595 1113 if (tree.sym.hasOuterInstance()) {
mcimadamore@1595 1114 //if a class is defined within a lambda, the lambda must capture
mcimadamore@1595 1115 //its enclosing instance (if any)
mcimadamore@1612 1116 TranslationContext<?> localContext = context();
mcimadamore@1612 1117 while (localContext != null) {
mcimadamore@1612 1118 if (localContext.tree.getTag() == LAMBDA) {
mcimadamore@1612 1119 ((LambdaTranslationContext)localContext)
mcimadamore@1612 1120 .addSymbol(tree.sym.type.getEnclosingType().tsym, CAPTURED_THIS);
mcimadamore@1612 1121 }
mcimadamore@1612 1122 localContext = localContext.prev;
mcimadamore@1612 1123 }
rfield@1380 1124 }
rfield@1380 1125 }
rfield@1380 1126 frameStack = frameStack.prepend(new Frame(tree));
rfield@1380 1127 super.visitClassDef(tree);
rfield@1380 1128 }
rfield@1380 1129 finally {
rfield@1380 1130 frameStack = prevStack;
rfield@1587 1131 serializableLambdaCounts = prevSerializableLambdaCount;
rfield@1587 1132 clinits = prevClinits;
rfield@1380 1133 }
rfield@1380 1134 }
rfield@1380 1135
rfield@1380 1136 @Override
rfield@1380 1137 public void visitIdent(JCIdent tree) {
rfield@1587 1138 if (context() != null && lambdaIdentSymbolFilter(tree.sym)) {
rfield@1380 1139 if (tree.sym.kind == VAR &&
rfield@1380 1140 tree.sym.owner.kind == MTH &&
rfield@1380 1141 tree.type.constValue() == null) {
rfield@1380 1142 TranslationContext<?> localContext = context();
rfield@1380 1143 while (localContext != null) {
rfield@1380 1144 if (localContext.tree.getTag() == LAMBDA) {
rfield@1380 1145 JCTree block = capturedDecl(localContext.depth, tree.sym);
rfield@1380 1146 if (block == null) break;
mcimadamore@1595 1147 ((LambdaTranslationContext)localContext)
mcimadamore@1595 1148 .addSymbol(tree.sym, CAPTURED_VAR);
rfield@1380 1149 }
rfield@1380 1150 localContext = localContext.prev;
rfield@1380 1151 }
rfield@1380 1152 } else if (tree.sym.owner.kind == TYP) {
rfield@1380 1153 TranslationContext<?> localContext = context();
rfield@1380 1154 while (localContext != null) {
rfield@1380 1155 if (localContext.tree.hasTag(LAMBDA)) {
rfield@1380 1156 JCTree block = capturedDecl(localContext.depth, tree.sym);
rfield@1380 1157 if (block == null) break;
rfield@1380 1158 switch (block.getTag()) {
rfield@1380 1159 case CLASSDEF:
rfield@1380 1160 JCClassDecl cdecl = (JCClassDecl)block;
mcimadamore@1595 1161 ((LambdaTranslationContext)localContext)
mcimadamore@1595 1162 .addSymbol(cdecl.sym, CAPTURED_THIS);
rfield@1380 1163 break;
rfield@1380 1164 default:
rfield@1380 1165 Assert.error("bad block kind");
rfield@1380 1166 }
rfield@1380 1167 }
rfield@1380 1168 localContext = localContext.prev;
rfield@1380 1169 }
rfield@1380 1170 }
rfield@1380 1171 }
rfield@1587 1172 super.visitIdent(tree);
rfield@1380 1173 }
rfield@1380 1174
rfield@1380 1175 @Override
rfield@1380 1176 public void visitLambda(JCLambda tree) {
rfield@1380 1177 List<Frame> prevStack = frameStack;
rfield@1380 1178 try {
rfield@1380 1179 LambdaTranslationContext context = (LambdaTranslationContext)makeLambdaContext(tree);
rfield@1380 1180 frameStack = frameStack.prepend(new Frame(tree));
rfield@1380 1181 for (JCVariableDecl param : tree.params) {
rfield@1380 1182 context.addSymbol(param.sym, PARAM);
rfield@1380 1183 frameStack.head.addLocal(param.sym);
rfield@1380 1184 }
rfield@1380 1185 contextMap.put(tree, context);
rfield@1717 1186 super.visitLambda(tree);
rfield@1380 1187 context.complete();
rfield@1380 1188 }
rfield@1380 1189 finally {
rfield@1380 1190 frameStack = prevStack;
rfield@1380 1191 }
rfield@1380 1192 }
rfield@1380 1193
rfield@1380 1194 @Override
rfield@1380 1195 public void visitMethodDef(JCMethodDecl tree) {
rfield@1380 1196 List<Frame> prevStack = frameStack;
rfield@1380 1197 try {
rfield@1380 1198 frameStack = frameStack.prepend(new Frame(tree));
rfield@1380 1199 super.visitMethodDef(tree);
rfield@1380 1200 }
rfield@1380 1201 finally {
rfield@1380 1202 frameStack = prevStack;
rfield@1380 1203 }
rfield@1380 1204 }
rfield@1380 1205
rfield@1380 1206 @Override
rfield@1380 1207 public void visitNewClass(JCNewClass tree) {
rfield@1380 1208 if (lambdaNewClassFilter(context(), tree)) {
mcimadamore@1612 1209 TranslationContext<?> localContext = context();
mcimadamore@1612 1210 while (localContext != null) {
mcimadamore@1612 1211 if (localContext.tree.getTag() == LAMBDA) {
mcimadamore@1612 1212 ((LambdaTranslationContext)localContext)
mcimadamore@1612 1213 .addSymbol(tree.type.getEnclosingType().tsym, CAPTURED_THIS);
mcimadamore@1612 1214 }
mcimadamore@1612 1215 localContext = localContext.prev;
mcimadamore@1612 1216 }
mcimadamore@1612 1217 }
mcimadamore@1612 1218 if (context() != null && tree.type.tsym.owner.kind == MTH) {
mcimadamore@1612 1219 LambdaTranslationContext lambdaContext = (LambdaTranslationContext)context();
mcimadamore@1612 1220 captureLocalClassDefs(tree.type.tsym, lambdaContext);
rfield@1380 1221 }
rfield@1380 1222 super.visitNewClass(tree);
rfield@1380 1223 }
mcimadamore@1612 1224 //where
mcimadamore@1612 1225 void captureLocalClassDefs(Symbol csym, final LambdaTranslationContext lambdaContext) {
mcimadamore@1612 1226 JCClassDecl localCDef = localClassDefs.get(csym);
mcimadamore@1612 1227 if (localCDef != null && localCDef.pos < lambdaContext.tree.pos) {
mcimadamore@1612 1228 BasicFreeVarCollector fvc = lower.new BasicFreeVarCollector() {
mcimadamore@1612 1229 @Override
mcimadamore@1612 1230 void addFreeVars(ClassSymbol c) {
mcimadamore@1612 1231 captureLocalClassDefs(c, lambdaContext);
mcimadamore@1612 1232 }
mcimadamore@1612 1233 @Override
mcimadamore@1612 1234 void visitSymbol(Symbol sym) {
mcimadamore@1612 1235 if (sym.kind == VAR &&
mcimadamore@1612 1236 sym.owner.kind == MTH &&
mcimadamore@1612 1237 ((VarSymbol)sym).getConstValue() == null) {
mcimadamore@1612 1238 TranslationContext<?> localContext = context();
mcimadamore@1612 1239 while (localContext != null) {
mcimadamore@1612 1240 if (localContext.tree.getTag() == LAMBDA) {
mcimadamore@1612 1241 JCTree block = capturedDecl(localContext.depth, sym);
mcimadamore@1612 1242 if (block == null) break;
mcimadamore@1612 1243 ((LambdaTranslationContext)localContext).addSymbol(sym, CAPTURED_VAR);
mcimadamore@1612 1244 }
mcimadamore@1612 1245 localContext = localContext.prev;
mcimadamore@1612 1246 }
mcimadamore@1612 1247 }
mcimadamore@1612 1248 }
mcimadamore@1612 1249 };
mcimadamore@1612 1250 fvc.scan(localCDef);
mcimadamore@1612 1251 }
rfield@1717 1252 }
rfield@1380 1253
rfield@1717 1254 /**
rfield@1717 1255 * Method references to local class constructors, may, if the local
rfield@1717 1256 * class references local variables, have implicit constructor
rfield@1717 1257 * parameters added in Lower; As a result, the invokedynamic bootstrap
rfield@1717 1258 * information added in the LambdaToMethod pass will have the wrong
rfield@1717 1259 * signature. Hooks between Lower and LambdaToMethod have been added to
rfield@1717 1260 * handle normal "new" in this case. This visitor converts potentially
rfield@1717 1261 * effected method references into a lambda containing a normal "new" of
rfield@1717 1262 * the class.
rfield@1717 1263 *
rfield@1717 1264 * @param tree
rfield@1717 1265 */
rfield@1380 1266 @Override
rfield@1380 1267 public void visitReference(JCMemberReference tree) {
rfield@1717 1268 if (tree.getMode() == ReferenceMode.NEW
rfield@1717 1269 && tree.kind != ReferenceKind.ARRAY_CTOR
rfield@1717 1270 && tree.sym.owner.isLocal()) {
rfield@1717 1271 MethodSymbol consSym = (MethodSymbol) tree.sym;
rfield@1717 1272 List<Type> ptypes = ((MethodType) consSym.type).getParameterTypes();
rfield@1717 1273 Type classType = consSym.owner.type;
rfield@1717 1274
rfield@1727 1275 // Build lambda parameters
rfield@1727 1276 // partially cloned from TreeMaker.Params until 8014021 is fixed
rfield@1727 1277 Symbol owner = owner();
rfield@1727 1278 ListBuffer<JCVariableDecl> paramBuff = new ListBuffer<JCVariableDecl>();
rfield@1727 1279 int i = 0;
rfield@1727 1280 for (List<Type> l = ptypes; l.nonEmpty(); l = l.tail) {
rfield@1727 1281 paramBuff.append(make.Param(make.paramName(i++), l.head, owner));
rfield@1727 1282 }
rfield@1727 1283 List<JCVariableDecl> params = paramBuff.toList();
rfield@1727 1284
rfield@1717 1285 // Make new-class call
rfield@1717 1286 JCNewClass nc = makeNewClass(classType, make.Idents(params));
rfield@1717 1287 nc.pos = tree.pos;
rfield@1717 1288
rfield@1717 1289 // Make lambda holding the new-class call
rfield@1717 1290 JCLambda slam = make.Lambda(params, nc);
rfield@1717 1291 slam.descriptorType = tree.descriptorType;
rfield@1717 1292 slam.targets = tree.targets;
rfield@1717 1293 slam.type = tree.type;
rfield@1717 1294 slam.pos = tree.pos;
rfield@1717 1295
rfield@1717 1296 // Now it is a lambda, process as such
rfield@1717 1297 visitLambda(slam);
rfield@1717 1298 } else {
rfield@1717 1299 super.visitReference(tree);
rfield@1717 1300 contextMap.put(tree, makeReferenceContext(tree));
rfield@1717 1301 }
rfield@1380 1302 }
rfield@1380 1303
rfield@1380 1304 @Override
rfield@1380 1305 public void visitSelect(JCFieldAccess tree) {
rfield@1380 1306 if (context() != null && lambdaSelectSymbolFilter(tree.sym)) {
rfield@1380 1307 TranslationContext<?> localContext = context();
rfield@1380 1308 while (localContext != null) {
rfield@1380 1309 if (localContext.tree.hasTag(LAMBDA)) {
rfield@1380 1310 JCClassDecl clazz = (JCClassDecl)capturedDecl(localContext.depth, tree.sym);
rfield@1380 1311 if (clazz == null) break;
rfield@1380 1312 ((LambdaTranslationContext)localContext).addSymbol(clazz.sym, CAPTURED_THIS);
rfield@1380 1313 }
rfield@1380 1314 localContext = localContext.prev;
rfield@1380 1315 }
rfield@1380 1316 }
rfield@1717 1317 super.visitSelect(tree);
rfield@1380 1318 }
rfield@1380 1319
rfield@1380 1320 @Override
rfield@1380 1321 public void visitVarDef(JCVariableDecl tree) {
rfield@1587 1322 TranslationContext<?> context = context();
rfield@1587 1323 LambdaTranslationContext ltc = (context != null && context instanceof LambdaTranslationContext)?
rfield@1587 1324 (LambdaTranslationContext)context :
rfield@1587 1325 null;
rfield@1587 1326 if (ltc != null) {
rfield@1587 1327 if (frameStack.head.tree.hasTag(LAMBDA)) {
rfield@1587 1328 ltc.addSymbol(tree.sym, LOCAL_VAR);
rfield@1587 1329 }
rfield@1587 1330 // Check for type variables (including as type arguments).
rfield@1587 1331 // If they occur within class nested in a lambda, mark for erasure
rfield@1587 1332 Type type = tree.sym.asType();
rfield@1587 1333 if (inClassWithinLambda() && !types.isSameType(types.erasure(type), type)) {
rfield@1587 1334 ltc.addSymbol(tree.sym, TYPE_VAR);
rfield@1587 1335 }
rfield@1380 1336 }
rfield@1587 1337
rfield@1380 1338 List<Frame> prevStack = frameStack;
rfield@1380 1339 try {
rfield@1380 1340 if (tree.sym.owner.kind == MTH) {
rfield@1380 1341 frameStack.head.addLocal(tree.sym);
rfield@1380 1342 }
rfield@1380 1343 frameStack = frameStack.prepend(new Frame(tree));
rfield@1380 1344 super.visitVarDef(tree);
rfield@1380 1345 }
rfield@1380 1346 finally {
rfield@1380 1347 frameStack = prevStack;
rfield@1380 1348 }
rfield@1380 1349 }
rfield@1380 1350
rfield@1380 1351 private Name lambdaName() {
rfield@1587 1352 return names.lambda.append(names.fromString("" + lambdaCount++));
rfield@1587 1353 }
rfield@1587 1354
rfield@1639 1355 /**
rfield@1639 1356 * For a serializable lambda, generate a name which maximizes name
rfield@1639 1357 * stability across deserialization.
rfield@1639 1358 * @param owner
rfield@1639 1359 * @return Name to use for the synthetic lambda method name
rfield@1639 1360 */
rfield@1587 1361 private Name serializedLambdaName(Symbol owner) {
rfield@1587 1362 StringBuilder buf = new StringBuilder();
rfield@1587 1363 buf.append(names.lambda);
rfield@1639 1364 // Append the name of the method enclosing the lambda.
rfield@1624 1365 String methodName = owner.name.toString();
rfield@1624 1366 if (methodName.equals("<clinit>"))
rfield@1624 1367 methodName = "static";
rfield@1624 1368 else if (methodName.equals("<init>"))
rfield@1624 1369 methodName = "new";
rfield@1624 1370 buf.append(methodName);
rfield@1587 1371 buf.append('$');
rfield@1639 1372 // Append a hash of the enclosing method signature to differentiate
rfield@1639 1373 // overloaded enclosing methods. For lambdas enclosed in lambdas,
rfield@1639 1374 // the generated lambda method will not have type yet, but the
rfield@1639 1375 // enclosing method's name will have been generated with this same
rfield@1639 1376 // method, so it will be unique and never be overloaded.
mcimadamore@1666 1377 Assert.check(owner.type != null || directlyEnclosingLambda() != null);
rfield@1639 1378 if (owner.type != null) {
rfield@1639 1379 int methTypeHash = methodSig(owner.type).hashCode();
rfield@1639 1380 buf.append(Integer.toHexString(methTypeHash));
rfield@1639 1381 }
rfield@1587 1382 buf.append('$');
rfield@1639 1383 // The above appended name components may not be unique, append a
rfield@1639 1384 // count based on the above name components.
rfield@1587 1385 String temp = buf.toString();
rfield@1587 1386 Integer count = serializableLambdaCounts.get(temp);
rfield@1587 1387 if (count == null) {
rfield@1587 1388 count = 0;
rfield@1587 1389 }
rfield@1587 1390 buf.append(count++);
rfield@1587 1391 serializableLambdaCounts.put(temp, count);
rfield@1587 1392 return names.fromString(buf.toString());
rfield@1380 1393 }
rfield@1380 1394
rfield@1380 1395 /**
rfield@1380 1396 * Return a valid owner given the current declaration stack
rfield@1380 1397 * (required to skip synthetic lambda symbols)
rfield@1380 1398 */
rfield@1380 1399 private Symbol owner() {
mcimadamore@1515 1400 return owner(false);
mcimadamore@1515 1401 }
mcimadamore@1515 1402
mcimadamore@1515 1403 @SuppressWarnings("fallthrough")
mcimadamore@1515 1404 private Symbol owner(boolean skipLambda) {
rfield@1380 1405 List<Frame> frameStack2 = frameStack;
rfield@1380 1406 while (frameStack2.nonEmpty()) {
rfield@1380 1407 switch (frameStack2.head.tree.getTag()) {
rfield@1380 1408 case VARDEF:
rfield@1380 1409 if (((JCVariableDecl)frameStack2.head.tree).sym.isLocal()) {
rfield@1380 1410 frameStack2 = frameStack2.tail;
rfield@1380 1411 break;
rfield@1380 1412 }
rfield@1380 1413 JCClassDecl cdecl = (JCClassDecl)frameStack2.tail.head.tree;
rfield@1587 1414 return initSym(cdecl.sym,
rfield@1587 1415 ((JCVariableDecl)frameStack2.head.tree).sym.flags() & STATIC);
rfield@1380 1416 case BLOCK:
rfield@1380 1417 JCClassDecl cdecl2 = (JCClassDecl)frameStack2.tail.head.tree;
rfield@1587 1418 return initSym(cdecl2.sym,
rfield@1587 1419 ((JCBlock)frameStack2.head.tree).flags & STATIC);
rfield@1380 1420 case CLASSDEF:
rfield@1380 1421 return ((JCClassDecl)frameStack2.head.tree).sym;
rfield@1380 1422 case METHODDEF:
rfield@1380 1423 return ((JCMethodDecl)frameStack2.head.tree).sym;
rfield@1380 1424 case LAMBDA:
mcimadamore@1515 1425 if (!skipLambda)
mcimadamore@1595 1426 return ((LambdaTranslationContext)contextMap
mcimadamore@1595 1427 .get(frameStack2.head.tree)).translatedSym;
rfield@1380 1428 default:
rfield@1380 1429 frameStack2 = frameStack2.tail;
rfield@1380 1430 }
rfield@1380 1431 }
rfield@1380 1432 Assert.error();
rfield@1380 1433 return null;
rfield@1380 1434 }
rfield@1380 1435
rfield@1587 1436 private Symbol initSym(ClassSymbol csym, long flags) {
rfield@1587 1437 boolean isStatic = (flags & STATIC) != 0;
rfield@1587 1438 if (isStatic) {
rfield@1587 1439 //static clinits are generated in Gen - so we need to fake them
rfield@1587 1440 Symbol clinit = clinits.get(csym);
rfield@1587 1441 if (clinit == null) {
rfield@1587 1442 clinit = makeSyntheticMethod(STATIC,
rfield@1587 1443 names.clinit,
rfield@1587 1444 new MethodType(List.<Type>nil(), syms.voidType, List.<Type>nil(), syms.methodClass),
rfield@1587 1445 csym);
rfield@1587 1446 clinits.put(csym, clinit);
rfield@1587 1447 }
rfield@1587 1448 return clinit;
rfield@1587 1449 } else {
rfield@1587 1450 //get the first constructor and treat it as the instance init sym
rfield@1587 1451 for (Symbol s : csym.members_field.getElementsByName(names.init)) {
rfield@1587 1452 return s;
rfield@1587 1453 }
rfield@1587 1454 }
rfield@1587 1455 Assert.error("init not found");
rfield@1587 1456 return null;
rfield@1587 1457 }
rfield@1587 1458
rfield@1587 1459 private JCTree directlyEnclosingLambda() {
rfield@1587 1460 if (frameStack.isEmpty()) {
rfield@1587 1461 return null;
rfield@1587 1462 }
rfield@1380 1463 List<Frame> frameStack2 = frameStack;
rfield@1380 1464 while (frameStack2.nonEmpty()) {
rfield@1380 1465 switch (frameStack2.head.tree.getTag()) {
rfield@1380 1466 case CLASSDEF:
rfield@1380 1467 case METHODDEF:
rfield@1380 1468 return null;
rfield@1380 1469 case LAMBDA:
rfield@1380 1470 return frameStack2.head.tree;
rfield@1380 1471 default:
rfield@1380 1472 frameStack2 = frameStack2.tail;
rfield@1380 1473 }
rfield@1380 1474 }
rfield@1380 1475 Assert.error();
rfield@1380 1476 return null;
rfield@1380 1477 }
rfield@1380 1478
rfield@1587 1479 private boolean inClassWithinLambda() {
rfield@1587 1480 if (frameStack.isEmpty()) {
rfield@1587 1481 return false;
rfield@1587 1482 }
rfield@1587 1483 List<Frame> frameStack2 = frameStack;
rfield@1587 1484 boolean classFound = false;
rfield@1587 1485 while (frameStack2.nonEmpty()) {
rfield@1587 1486 switch (frameStack2.head.tree.getTag()) {
rfield@1587 1487 case LAMBDA:
rfield@1587 1488 return classFound;
rfield@1587 1489 case CLASSDEF:
rfield@1587 1490 classFound = true;
rfield@1587 1491 frameStack2 = frameStack2.tail;
rfield@1587 1492 break;
rfield@1587 1493 default:
rfield@1587 1494 frameStack2 = frameStack2.tail;
rfield@1587 1495 }
rfield@1587 1496 }
rfield@1587 1497 // No lambda
rfield@1587 1498 return false;
rfield@1587 1499 }
rfield@1587 1500
rfield@1380 1501 /**
rfield@1380 1502 * Return the declaration corresponding to a symbol in the enclosing
rfield@1380 1503 * scope; the depth parameter is used to filter out symbols defined
rfield@1380 1504 * in nested scopes (which do not need to undergo capture).
rfield@1380 1505 */
rfield@1380 1506 private JCTree capturedDecl(int depth, Symbol sym) {
rfield@1380 1507 int currentDepth = frameStack.size() - 1;
rfield@1380 1508 for (Frame block : frameStack) {
rfield@1380 1509 switch (block.tree.getTag()) {
rfield@1380 1510 case CLASSDEF:
rfield@1380 1511 ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
rfield@1380 1512 if (sym.isMemberOf(clazz, types)) {
rfield@1380 1513 return currentDepth > depth ? null : block.tree;
rfield@1380 1514 }
rfield@1380 1515 break;
rfield@1380 1516 case VARDEF:
rfield@1380 1517 if (((JCVariableDecl)block.tree).sym == sym &&
rfield@1380 1518 sym.owner.kind == MTH) { //only locals are captured
rfield@1380 1519 return currentDepth > depth ? null : block.tree;
rfield@1380 1520 }
rfield@1380 1521 break;
rfield@1380 1522 case BLOCK:
rfield@1380 1523 case METHODDEF:
rfield@1380 1524 case LAMBDA:
rfield@1380 1525 if (block.locals != null && block.locals.contains(sym)) {
rfield@1380 1526 return currentDepth > depth ? null : block.tree;
rfield@1380 1527 }
rfield@1380 1528 break;
rfield@1380 1529 default:
rfield@1380 1530 Assert.error("bad decl kind " + block.tree.getTag());
rfield@1380 1531 }
rfield@1380 1532 currentDepth--;
rfield@1380 1533 }
rfield@1380 1534 return null;
rfield@1380 1535 }
rfield@1380 1536
rfield@1380 1537 private TranslationContext<?> context() {
rfield@1380 1538 for (Frame frame : frameStack) {
rfield@1380 1539 TranslationContext<?> context = contextMap.get(frame.tree);
rfield@1380 1540 if (context != null) {
rfield@1380 1541 return context;
rfield@1380 1542 }
rfield@1380 1543 }
rfield@1380 1544 return null;
rfield@1380 1545 }
rfield@1380 1546
rfield@1380 1547 /**
rfield@1380 1548 * This is used to filter out those identifiers that needs to be adjusted
rfield@1380 1549 * when translating away lambda expressions
rfield@1380 1550 */
rfield@1380 1551 private boolean lambdaIdentSymbolFilter(Symbol sym) {
rfield@1380 1552 return (sym.kind == VAR || sym.kind == MTH)
rfield@1380 1553 && !sym.isStatic()
rfield@1380 1554 && sym.name != names.init;
rfield@1380 1555 }
rfield@1380 1556
rfield@1380 1557 private boolean lambdaSelectSymbolFilter(Symbol sym) {
rfield@1380 1558 return (sym.kind == VAR || sym.kind == MTH) &&
rfield@1380 1559 !sym.isStatic() &&
rfield@1380 1560 (sym.name == names._this ||
rfield@1380 1561 sym.name == names._super);
rfield@1380 1562 }
rfield@1380 1563
rfield@1380 1564 /**
rfield@1380 1565 * This is used to filter out those new class expressions that need to
rfield@1380 1566 * be qualified with an enclosing tree
rfield@1380 1567 */
rfield@1380 1568 private boolean lambdaNewClassFilter(TranslationContext<?> context, JCNewClass tree) {
rfield@1380 1569 if (context != null
rfield@1380 1570 && tree.encl == null
rfield@1380 1571 && tree.def == null
rfield@1405 1572 && !tree.type.getEnclosingType().hasTag(NONE)) {
rfield@1380 1573 Type encl = tree.type.getEnclosingType();
rfield@1380 1574 Type current = context.owner.enclClass().type;
rfield@1405 1575 while (!current.hasTag(NONE)) {
rfield@1380 1576 if (current.tsym.isSubClass(encl.tsym, types)) {
rfield@1380 1577 return true;
rfield@1380 1578 }
rfield@1380 1579 current = current.getEnclosingType();
rfield@1380 1580 }
rfield@1380 1581 return false;
rfield@1380 1582 } else {
rfield@1380 1583 return false;
rfield@1380 1584 }
rfield@1380 1585 }
rfield@1380 1586
rfield@1380 1587 private TranslationContext<JCLambda> makeLambdaContext(JCLambda tree) {
rfield@1380 1588 return new LambdaTranslationContext(tree);
rfield@1380 1589 }
rfield@1380 1590
rfield@1380 1591 private TranslationContext<JCMemberReference> makeReferenceContext(JCMemberReference tree) {
rfield@1380 1592 return new ReferenceTranslationContext(tree);
rfield@1380 1593 }
rfield@1380 1594
rfield@1380 1595 private class Frame {
rfield@1380 1596 final JCTree tree;
rfield@1380 1597 List<Symbol> locals;
rfield@1380 1598
rfield@1380 1599 public Frame(JCTree tree) {
rfield@1380 1600 this.tree = tree;
rfield@1380 1601 }
rfield@1380 1602
rfield@1380 1603 void addLocal(Symbol sym) {
rfield@1380 1604 if (locals == null) {
rfield@1380 1605 locals = List.nil();
rfield@1380 1606 }
rfield@1380 1607 locals = locals.prepend(sym);
rfield@1380 1608 }
rfield@1380 1609 }
rfield@1380 1610
rfield@1380 1611 /**
rfield@1380 1612 * This class is used to store important information regarding translation of
rfield@1380 1613 * lambda expression/method references (see subclasses).
rfield@1380 1614 */
mcimadamore@1510 1615 private abstract class TranslationContext<T extends JCFunctionalExpression> {
rfield@1380 1616
rfield@1380 1617 /** the underlying (untranslated) tree */
rfield@1380 1618 T tree;
rfield@1380 1619
rfield@1380 1620 /** points to the adjusted enclosing scope in which this lambda/mref expression occurs */
rfield@1380 1621 Symbol owner;
rfield@1380 1622
rfield@1380 1623 /** the depth of this lambda expression in the frame stack */
rfield@1380 1624 int depth;
rfield@1380 1625
rfield@1380 1626 /** the enclosing translation context (set for nested lambdas/mref) */
rfield@1380 1627 TranslationContext<?> prev;
rfield@1380 1628
rfield@1380 1629 TranslationContext(T tree) {
rfield@1380 1630 this.tree = tree;
rfield@1380 1631 this.owner = owner();
rfield@1380 1632 this.depth = frameStack.size() - 1;
rfield@1380 1633 this.prev = context();
rfield@1380 1634 }
rfield@1587 1635
rfield@1587 1636 /** does this functional expression need to be created using alternate metafactory? */
rfield@1587 1637 boolean needsAltMetafactory() {
rfield@1587 1638 return (tree.targets.length() > 1 ||
rfield@1587 1639 isSerializable());
rfield@1587 1640 }
rfield@1587 1641
rfield@1587 1642 /** does this functional expression require serialization support? */
rfield@1587 1643 boolean isSerializable() {
rfield@1587 1644 for (Symbol target : tree.targets) {
rfield@1587 1645 if (types.asSuper(target.type, syms.serializableType.tsym) != null) {
rfield@1587 1646 return true;
rfield@1587 1647 }
rfield@1587 1648 }
rfield@1587 1649 return false;
rfield@1587 1650 }
rfield@1380 1651 }
rfield@1380 1652
rfield@1380 1653 /**
rfield@1380 1654 * This class retains all the useful information about a lambda expression;
rfield@1380 1655 * the contents of this class are filled by the LambdaAnalyzer visitor,
rfield@1380 1656 * and the used by the main translation routines in order to adjust references
rfield@1380 1657 * to captured locals/members, etc.
rfield@1380 1658 */
rfield@1380 1659 private class LambdaTranslationContext extends TranslationContext<JCLambda> {
rfield@1380 1660
rfield@1380 1661 /** variable in the enclosing context to which this lambda is assigned */
rfield@1380 1662 Symbol self;
rfield@1380 1663
rfield@1380 1664 /** map from original to translated lambda parameters */
rfield@1380 1665 Map<Symbol, Symbol> lambdaParams = new LinkedHashMap<Symbol, Symbol>();
rfield@1380 1666
rfield@1380 1667 /** map from original to translated lambda locals */
rfield@1380 1668 Map<Symbol, Symbol> lambdaLocals = new LinkedHashMap<Symbol, Symbol>();
rfield@1380 1669
rfield@1380 1670 /** map from variables in enclosing scope to translated synthetic parameters */
rfield@1380 1671 Map<Symbol, Symbol> capturedLocals = new LinkedHashMap<Symbol, Symbol>();
rfield@1380 1672
rfield@1380 1673 /** map from class symbols to translated synthetic parameters (for captured member access) */
rfield@1380 1674 Map<Symbol, Symbol> capturedThis = new LinkedHashMap<Symbol, Symbol>();
rfield@1380 1675
rfield@1587 1676 /** map from original to translated lambda locals */
rfield@1587 1677 Map<Symbol, Symbol> typeVars = new LinkedHashMap<Symbol, Symbol>();
rfield@1587 1678
rfield@1380 1679 /** the synthetic symbol for the method hoisting the translated lambda */
rfield@1380 1680 Symbol translatedSym;
rfield@1380 1681
rfield@1380 1682 List<JCVariableDecl> syntheticParams;
rfield@1380 1683
rfield@1380 1684 LambdaTranslationContext(JCLambda tree) {
rfield@1380 1685 super(tree);
rfield@1380 1686 Frame frame = frameStack.head;
rfield@1380 1687 if (frame.tree.hasTag(VARDEF)) {
rfield@1380 1688 self = ((JCVariableDecl)frame.tree).sym;
rfield@1380 1689 }
rfield@1587 1690 Name name = isSerializable() ? serializedLambdaName(owner) : lambdaName();
rfield@1587 1691 this.translatedSym = makeSyntheticMethod(0, name, null, owner.enclClass());
rfield@1380 1692 }
rfield@1380 1693
rfield@1380 1694 /**
rfield@1380 1695 * Translate a symbol of a given kind into something suitable for the
rfield@1380 1696 * synthetic lambda body
rfield@1380 1697 */
mcimadamore@1652 1698 Symbol translate(Name name, final Symbol sym, LambdaSymbolKind skind) {
jjg@1755 1699 Symbol ret;
rfield@1587 1700 switch (skind) {
rfield@1587 1701 case CAPTURED_THIS:
jjg@1755 1702 ret = sym; // self represented
jjg@1755 1703 break;
rfield@1587 1704 case TYPE_VAR:
rfield@1587 1705 // Just erase the type var
jjg@1755 1706 ret = new VarSymbol(sym.flags(), name,
mcimadamore@1595 1707 types.erasure(sym.type), sym.owner);
jjg@1755 1708 break;
mcimadamore@1612 1709 case CAPTURED_VAR:
jjg@1755 1710 ret = new VarSymbol(SYNTHETIC | FINAL, name, types.erasure(sym.type), translatedSym) {
mcimadamore@1612 1711 @Override
mcimadamore@1612 1712 public Symbol baseSymbol() {
mcimadamore@1612 1713 //keep mapping with original captured symbol
mcimadamore@1612 1714 return sym;
mcimadamore@1612 1715 }
mcimadamore@1612 1716 };
jjg@1755 1717 break;
rfield@1587 1718 default:
jjg@1755 1719 ret = makeSyntheticVar(FINAL, name, types.erasure(sym.type), translatedSym);
rfield@1380 1720 }
jjg@1755 1721 if (ret != sym) {
jjg@1755 1722 ret.annotations.setDeclarationAttributes(sym.getRawAttributes());
jjg@1755 1723 ret.annotations.setTypeAttributes(sym.getRawTypeAttributes());
jjg@1755 1724 }
jjg@1755 1725 return ret;
rfield@1380 1726 }
rfield@1380 1727
rfield@1380 1728 void addSymbol(Symbol sym, LambdaSymbolKind skind) {
rfield@1380 1729 Map<Symbol, Symbol> transMap = null;
mcimadamore@1652 1730 Name preferredName;
rfield@1380 1731 switch (skind) {
rfield@1380 1732 case CAPTURED_THIS:
rfield@1380 1733 transMap = capturedThis;
mcimadamore@1652 1734 preferredName = names.fromString("encl$" + capturedThis.size());
rfield@1380 1735 break;
rfield@1380 1736 case CAPTURED_VAR:
rfield@1380 1737 transMap = capturedLocals;
mcimadamore@1652 1738 preferredName = names.fromString("cap$" + capturedLocals.size());
rfield@1380 1739 break;
rfield@1380 1740 case LOCAL_VAR:
rfield@1380 1741 transMap = lambdaLocals;
mcimadamore@1652 1742 preferredName = sym.name;
rfield@1380 1743 break;
rfield@1380 1744 case PARAM:
rfield@1380 1745 transMap = lambdaParams;
mcimadamore@1652 1746 preferredName = sym.name;
rfield@1380 1747 break;
rfield@1587 1748 case TYPE_VAR:
rfield@1587 1749 transMap = typeVars;
mcimadamore@1652 1750 preferredName = sym.name;
rfield@1587 1751 break;
rfield@1380 1752 default: throw new AssertionError();
rfield@1380 1753 }
rfield@1380 1754 if (!transMap.containsKey(sym)) {
rfield@1380 1755 transMap.put(sym, translate(preferredName, sym, skind));
rfield@1380 1756 }
rfield@1380 1757 }
rfield@1380 1758
rfield@1380 1759 Map<Symbol, Symbol> getSymbolMap(LambdaSymbolKind... skinds) {
rfield@1380 1760 LinkedHashMap<Symbol, Symbol> translationMap = new LinkedHashMap<Symbol, Symbol>();
rfield@1380 1761 for (LambdaSymbolKind skind : skinds) {
rfield@1380 1762 switch (skind) {
rfield@1380 1763 case CAPTURED_THIS:
rfield@1380 1764 translationMap.putAll(capturedThis);
rfield@1380 1765 break;
rfield@1380 1766 case CAPTURED_VAR:
rfield@1380 1767 translationMap.putAll(capturedLocals);
rfield@1380 1768 break;
rfield@1380 1769 case LOCAL_VAR:
rfield@1380 1770 translationMap.putAll(lambdaLocals);
rfield@1380 1771 break;
rfield@1380 1772 case PARAM:
rfield@1380 1773 translationMap.putAll(lambdaParams);
rfield@1380 1774 break;
rfield@1587 1775 case TYPE_VAR:
rfield@1587 1776 translationMap.putAll(typeVars);
rfield@1587 1777 break;
rfield@1380 1778 default: throw new AssertionError();
rfield@1380 1779 }
rfield@1380 1780 }
rfield@1380 1781 return translationMap;
rfield@1380 1782 }
rfield@1380 1783
rfield@1380 1784 /**
rfield@1380 1785 * The translatedSym is not complete/accurate until the analysis is
rfield@1380 1786 * finished. Once the analysis is finished, the translatedSym is
rfield@1380 1787 * "completed" -- updated with type information, access modifiers,
rfield@1380 1788 * and full parameter list.
rfield@1380 1789 */
rfield@1380 1790 void complete() {
rfield@1380 1791 if (syntheticParams != null) {
rfield@1380 1792 return;
rfield@1380 1793 }
rfield@1380 1794 boolean inInterface = translatedSym.owner.isInterface();
rfield@1380 1795 boolean thisReferenced = !getSymbolMap(CAPTURED_THIS).isEmpty();
rfield@1380 1796
rfield@1752 1797 // If instance access isn't needed, make it static.
rfield@1752 1798 // Interface instance methods must be default methods.
rfield@1752 1799 // Awaiting VM channges, default methods are public
rfield@1752 1800 translatedSym.flags_field = SYNTHETIC |
rfield@1752 1801 ((inInterface && thisReferenced)? PUBLIC : PRIVATE) |
rfield@1752 1802 (thisReferenced? (inInterface? DEFAULT : 0) : STATIC);
rfield@1380 1803
rfield@1380 1804 //compute synthetic params
rfield@1380 1805 ListBuffer<JCVariableDecl> params = ListBuffer.lb();
rfield@1380 1806
rfield@1380 1807 // The signature of the method is augmented with the following
rfield@1380 1808 // synthetic parameters:
rfield@1380 1809 //
rfield@1380 1810 // 1) reference to enclosing contexts captured by the lambda expression
rfield@1380 1811 // 2) enclosing locals captured by the lambda expression
rfield@1380 1812 for (Symbol thisSym : getSymbolMap(CAPTURED_VAR, PARAM).values()) {
rfield@1380 1813 params.append(make.VarDef((VarSymbol) thisSym, null));
rfield@1380 1814 }
rfield@1380 1815
rfield@1380 1816 syntheticParams = params.toList();
rfield@1380 1817
rfield@1380 1818 //prepend synthetic args to translated lambda method signature
rfield@1587 1819 translatedSym.type = types.createMethodTypeWithParameters(
rfield@1587 1820 generatedLambdaSig(),
rfield@1380 1821 TreeInfo.types(syntheticParams));
rfield@1380 1822 }
rfield@1380 1823
rfield@1380 1824 Type generatedLambdaSig() {
mcimadamore@1510 1825 return types.erasure(tree.descriptorType);
rfield@1380 1826 }
rfield@1380 1827 }
rfield@1380 1828
rfield@1380 1829 /**
rfield@1380 1830 * This class retains all the useful information about a method reference;
rfield@1380 1831 * the contents of this class are filled by the LambdaAnalyzer visitor,
rfield@1380 1832 * and the used by the main translation routines in order to adjust method
rfield@1380 1833 * references (i.e. in case a bridge is needed)
rfield@1380 1834 */
rfield@1380 1835 private class ReferenceTranslationContext extends TranslationContext<JCMemberReference> {
rfield@1380 1836
rfield@1380 1837 final boolean isSuper;
rfield@1380 1838 final Symbol bridgeSym;
rfield@1380 1839
rfield@1380 1840 ReferenceTranslationContext(JCMemberReference tree) {
rfield@1380 1841 super(tree);
rfield@1380 1842 this.isSuper = tree.hasKind(ReferenceKind.SUPER);
rfield@1380 1843 this.bridgeSym = needsBridge()
rfield@1380 1844 ? makeSyntheticMethod(isSuper ? 0 : STATIC,
rfield@1380 1845 lambdaName().append(names.fromString("$bridge")), null,
rfield@1380 1846 owner.enclClass())
rfield@1380 1847 : null;
rfield@1380 1848 }
rfield@1380 1849
rfield@1380 1850 /**
rfield@1380 1851 * Get the opcode associated with this method reference
rfield@1380 1852 */
rfield@1380 1853 int referenceKind() {
rfield@1380 1854 return LambdaToMethod.this.referenceKind(needsBridge() ? bridgeSym : tree.sym);
rfield@1380 1855 }
rfield@1380 1856
rfield@1380 1857 boolean needsVarArgsConversion() {
rfield@1380 1858 return tree.varargsElement != null;
rfield@1380 1859 }
rfield@1380 1860
rfield@1380 1861 /**
rfield@1380 1862 * @return Is this an array operation like clone()
rfield@1380 1863 */
rfield@1380 1864 boolean isArrayOp() {
rfield@1380 1865 return tree.sym.owner == syms.arrayClass;
rfield@1380 1866 }
rfield@1380 1867
mcimadamore@1597 1868 boolean isPrivateConstructor() {
mcimadamore@1615 1869 //hack needed to workaround 292 bug (8005122)
mcimadamore@1615 1870 //when 292 issue is fixed we should simply remove this
mcimadamore@1597 1871 return tree.sym.name == names.init &&
mcimadamore@1597 1872 (tree.sym.flags() & PRIVATE) != 0;
mcimadamore@1597 1873 }
mcimadamore@1597 1874
mcimadamore@1615 1875 boolean receiverAccessible() {
mcimadamore@1615 1876 //hack needed to workaround 292 bug (7087658)
mcimadamore@1615 1877 //when 292 issue is fixed we should remove this and change the backend
mcimadamore@1615 1878 //code to always generate a method handle to an accessible method
mcimadamore@1615 1879 return tree.ownerAccessible;
mcimadamore@1615 1880 }
mcimadamore@1615 1881
rfield@1380 1882 /**
rfield@1380 1883 * Does this reference needs a bridge (i.e. var args need to be
rfield@1380 1884 * expanded or "super" is used)
rfield@1380 1885 */
rfield@1380 1886 final boolean needsBridge() {
mcimadamore@1615 1887 return isSuper || needsVarArgsConversion() || isArrayOp() ||
mcimadamore@1615 1888 isPrivateConstructor() || !receiverAccessible();
rfield@1380 1889 }
rfield@1380 1890
rfield@1380 1891 Type generatedRefSig() {
rfield@1380 1892 return types.erasure(tree.sym.type);
rfield@1380 1893 }
rfield@1380 1894
rfield@1380 1895 Type bridgedRefSig() {
mcimadamore@1510 1896 return types.erasure(types.findDescriptorSymbol(tree.targets.head).type);
rfield@1380 1897 }
rfield@1380 1898 }
rfield@1380 1899 }
rfield@1380 1900 // </editor-fold>
rfield@1380 1901
rfield@1380 1902 enum LambdaSymbolKind {
rfield@1380 1903 CAPTURED_VAR,
rfield@1380 1904 CAPTURED_THIS,
rfield@1380 1905 LOCAL_VAR,
rfield@1587 1906 PARAM,
rfield@1587 1907 TYPE_VAR;
rfield@1587 1908 }
rfield@1587 1909
rfield@1587 1910 /**
rfield@1587 1911 * ****************************************************************
rfield@1587 1912 * Signature Generation
rfield@1587 1913 * ****************************************************************
rfield@1587 1914 */
rfield@1587 1915
rfield@1587 1916 private String methodSig(Type type) {
rfield@1587 1917 L2MSignatureGenerator sg = new L2MSignatureGenerator();
rfield@1587 1918 sg.assembleSig(type);
rfield@1587 1919 return sg.toString();
rfield@1587 1920 }
rfield@1587 1921
rfield@1587 1922 private String classSig(Type type) {
rfield@1587 1923 L2MSignatureGenerator sg = new L2MSignatureGenerator();
rfield@1587 1924 sg.assembleClassSig(type);
rfield@1587 1925 return sg.toString();
rfield@1587 1926 }
rfield@1587 1927
rfield@1587 1928 /**
rfield@1587 1929 * Signature Generation
rfield@1587 1930 */
rfield@1587 1931 private class L2MSignatureGenerator extends Types.SignatureGenerator {
rfield@1587 1932
rfield@1587 1933 /**
rfield@1587 1934 * An output buffer for type signatures.
rfield@1587 1935 */
rfield@1587 1936 StringBuilder sb = new StringBuilder();
rfield@1587 1937
rfield@1587 1938 L2MSignatureGenerator() {
rfield@1587 1939 super(types);
rfield@1587 1940 }
rfield@1587 1941
rfield@1587 1942 @Override
rfield@1587 1943 protected void append(char ch) {
rfield@1587 1944 sb.append(ch);
rfield@1587 1945 }
rfield@1587 1946
rfield@1587 1947 @Override
rfield@1587 1948 protected void append(byte[] ba) {
rfield@1587 1949 sb.append(new String(ba));
rfield@1587 1950 }
rfield@1587 1951
rfield@1587 1952 @Override
rfield@1587 1953 protected void append(Name name) {
rfield@1587 1954 sb.append(name.toString());
rfield@1587 1955 }
rfield@1587 1956
rfield@1587 1957 @Override
rfield@1587 1958 public String toString() {
rfield@1587 1959 return sb.toString();
rfield@1587 1960 }
rfield@1380 1961 }
rfield@1380 1962 }

mercurial