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

Fri, 15 Feb 2013 18:40:38 -0800

author
rfield
date
Fri, 15 Feb 2013 18:40:38 -0800
changeset 1587
f1f605f85850
parent 1515
b61e5f801f7c
child 1595
d686d8a7eb78
permissions
-rw-r--r--

8004969: Generate $deserializeLambda$ method
8006763: super in method reference used in anonymous class - ClassFormatError is produced
8005632: Inner classes within lambdas cause build failures
8005653: Lambdas containing inner classes referencing external type variables do not correctly parameterize the inner classes
Reviewed-by: mcimadamore

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

mercurial