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

Fri, 04 Apr 2014 12:23:37 +0100

author
pgovereau
date
Fri, 04 Apr 2014 12:23:37 +0100
changeset 2352
33c9946d2875
parent 2251
bbbef54e3b30
child 2358
6a6a8a9860a4
permissions
-rw-r--r--

8034048: javac crash with method references plus lambda plus var args
Reviewed-by: jjg, vromero

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

mercurial