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

Tue, 29 Mar 2016 10:48:49 +0000

author
dbuck
date
Tue, 29 Mar 2016 10:48:49 +0000
changeset 3102
e74dd6df4d4c
parent 3076
30f0dce3fbd3
child 3167
d5af468ae383
permissions
-rw-r--r--

8143647: Javac compiles method reference that allows results in an IllegalAccessError
Summary: Lambda implementation method synthesized by javac should not mention inaccessible types.
Reviewed-by: mcimadamore

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

mercurial