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