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

Mon, 29 Oct 2012 10:39:49 -0700

author
rfield
date
Mon, 29 Oct 2012 10:39:49 -0700
changeset 1380
a65971893c50
parent 1374
c002fdee76fd
child 1415
01c9d4161882
permissions
-rw-r--r--

8000694: Add generation of lambda implementation code: invokedynamic call, lambda method, adaptor methods
Summary: Add lambda implementation code with calling/supporting code elsewhere in the compiler
Reviewed-by: mcimadamore, jjg

duke@1 1 /*
jjh@1305 2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
duke@1 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
duke@1 4 *
duke@1 5 * This code is free software; you can redistribute it and/or modify it
duke@1 6 * under the terms of the GNU General Public License version 2 only, as
ohair@554 7 * published by the Free Software Foundation. Oracle designates this
duke@1 8 * particular file as subject to the "Classpath" exception as provided
ohair@554 9 * by Oracle in the LICENSE file that accompanied this code.
duke@1 10 *
duke@1 11 * This code is distributed in the hope that it will be useful, but WITHOUT
duke@1 12 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
duke@1 13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
duke@1 14 * version 2 for more details (a copy is included in the LICENSE file that
duke@1 15 * accompanied this code).
duke@1 16 *
duke@1 17 * You should have received a copy of the GNU General Public License version
duke@1 18 * 2 along with this work; if not, write to the Free Software Foundation,
duke@1 19 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
duke@1 20 *
ohair@554 21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
ohair@554 22 * or visit www.oracle.com if you need additional information or have any
ohair@554 23 * questions.
duke@1 24 */
duke@1 25
duke@1 26 package com.sun.tools.javac.comp;
duke@1 27
duke@1 28 import java.util.*;
duke@1 29
duke@1 30 import com.sun.tools.javac.code.*;
duke@1 31 import com.sun.tools.javac.code.Symbol.*;
duke@1 32 import com.sun.tools.javac.tree.*;
duke@1 33 import com.sun.tools.javac.tree.JCTree.*;
duke@1 34 import com.sun.tools.javac.util.*;
duke@1 35 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
duke@1 36 import com.sun.tools.javac.util.List;
duke@1 37
duke@1 38 import static com.sun.tools.javac.code.Flags.*;
duke@1 39 import static com.sun.tools.javac.code.Kinds.*;
jjg@1374 40 import static com.sun.tools.javac.code.TypeTag.CLASS;
jjg@1374 41 import static com.sun.tools.javac.code.TypeTag.TYPEVAR;
jjg@1374 42 import static com.sun.tools.javac.code.TypeTag.VOID;
duke@1 43
duke@1 44 /** This pass translates Generic Java to conventional Java.
duke@1 45 *
jjg@581 46 * <p><b>This is NOT part of any supported API.
jjg@581 47 * If you write code that depends on this, you do so at your own risk.
duke@1 48 * This code and its internal interfaces are subject to change or
duke@1 49 * deletion without notice.</b>
duke@1 50 */
duke@1 51 public class TransTypes extends TreeTranslator {
duke@1 52 /** The context key for the TransTypes phase. */
duke@1 53 protected static final Context.Key<TransTypes> transTypesKey =
duke@1 54 new Context.Key<TransTypes>();
duke@1 55
duke@1 56 /** Get the instance for this context. */
duke@1 57 public static TransTypes instance(Context context) {
duke@1 58 TransTypes instance = context.get(transTypesKey);
duke@1 59 if (instance == null)
duke@1 60 instance = new TransTypes(context);
duke@1 61 return instance;
duke@1 62 }
duke@1 63
jjg@113 64 private Names names;
duke@1 65 private Log log;
duke@1 66 private Symtab syms;
duke@1 67 private TreeMaker make;
duke@1 68 private Enter enter;
duke@1 69 private boolean allowEnums;
duke@1 70 private Types types;
duke@1 71 private final Resolve resolve;
duke@1 72
duke@1 73 /**
duke@1 74 * Flag to indicate whether or not to generate bridge methods.
duke@1 75 * For pre-Tiger source there is no need for bridge methods, so it
duke@1 76 * can be skipped to get better performance for -source 1.4 etc.
duke@1 77 */
duke@1 78 private final boolean addBridges;
duke@1 79
duke@1 80 protected TransTypes(Context context) {
duke@1 81 context.put(transTypesKey, this);
jjg@113 82 names = Names.instance(context);
duke@1 83 log = Log.instance(context);
duke@1 84 syms = Symtab.instance(context);
duke@1 85 enter = Enter.instance(context);
duke@1 86 overridden = new HashMap<MethodSymbol,MethodSymbol>();
duke@1 87 Source source = Source.instance(context);
duke@1 88 allowEnums = source.allowEnums();
duke@1 89 addBridges = source.addBridges();
duke@1 90 types = Types.instance(context);
duke@1 91 make = TreeMaker.instance(context);
duke@1 92 resolve = Resolve.instance(context);
duke@1 93 }
duke@1 94
duke@1 95 /** A hashtable mapping bridge methods to the methods they override after
duke@1 96 * type erasure.
duke@1 97 */
duke@1 98 Map<MethodSymbol,MethodSymbol> overridden;
duke@1 99
duke@1 100 /** Construct an attributed tree for a cast of expression to target type,
duke@1 101 * unless it already has precisely that type.
duke@1 102 * @param tree The expression tree.
duke@1 103 * @param target The target type.
duke@1 104 */
duke@1 105 JCExpression cast(JCExpression tree, Type target) {
duke@1 106 int oldpos = make.pos;
duke@1 107 make.at(tree.pos);
duke@1 108 if (!types.isSameType(tree.type, target)) {
duke@1 109 if (!resolve.isAccessible(env, target.tsym))
mcimadamore@1221 110 resolve.logAccessErrorInternal(env, tree, target);
duke@1 111 tree = make.TypeCast(make.Type(target), tree).setType(target);
duke@1 112 }
duke@1 113 make.pos = oldpos;
duke@1 114 return tree;
duke@1 115 }
duke@1 116
duke@1 117 /** Construct an attributed tree to coerce an expression to some erased
duke@1 118 * target type, unless the expression is already assignable to that type.
duke@1 119 * If target type is a constant type, use its base type instead.
duke@1 120 * @param tree The expression tree.
duke@1 121 * @param target The target type.
duke@1 122 */
rfield@1380 123 public JCExpression coerce(Env<AttrContext> env, JCExpression tree, Type target) {
rfield@1380 124 Env<AttrContext> prevEnv = this.env;
rfield@1380 125 try {
rfield@1380 126 this.env = env;
rfield@1380 127 return coerce(tree, target);
rfield@1380 128 }
rfield@1380 129 finally {
rfield@1380 130 this.env = prevEnv;
rfield@1380 131 }
rfield@1380 132 }
duke@1 133 JCExpression coerce(JCExpression tree, Type target) {
duke@1 134 Type btarget = target.baseType();
duke@1 135 if (tree.type.isPrimitive() == target.isPrimitive()) {
duke@1 136 return types.isAssignable(tree.type, btarget, Warner.noWarnings)
duke@1 137 ? tree
duke@1 138 : cast(tree, btarget);
duke@1 139 }
duke@1 140 return tree;
duke@1 141 }
duke@1 142
duke@1 143 /** Given an erased reference type, assume this type as the tree's type.
duke@1 144 * Then, coerce to some given target type unless target type is null.
duke@1 145 * This operation is used in situations like the following:
duke@1 146 *
jjg@1358 147 * <pre>{@code
duke@1 148 * class Cell<A> { A value; }
duke@1 149 * ...
duke@1 150 * Cell<Integer> cell;
duke@1 151 * Integer x = cell.value;
jjg@1358 152 * }</pre>
duke@1 153 *
duke@1 154 * Since the erasure of Cell.value is Object, but the type
duke@1 155 * of cell.value in the assignment is Integer, we need to
duke@1 156 * adjust the original type of cell.value to Object, and insert
duke@1 157 * a cast to Integer. That is, the last assignment becomes:
duke@1 158 *
jjg@1358 159 * <pre>{@code
duke@1 160 * Integer x = (Integer)cell.value;
jjg@1358 161 * }</pre>
duke@1 162 *
duke@1 163 * @param tree The expression tree whose type might need adjustment.
duke@1 164 * @param erasedType The expression's type after erasure.
duke@1 165 * @param target The target type, which is usually the erasure of the
duke@1 166 * expression's original type.
duke@1 167 */
duke@1 168 JCExpression retype(JCExpression tree, Type erasedType, Type target) {
duke@1 169 // System.err.println("retype " + tree + " to " + erasedType);//DEBUG
jjg@1374 170 if (!erasedType.isPrimitive()) {
duke@1 171 if (target != null && target.isPrimitive())
duke@1 172 target = erasure(tree.type);
duke@1 173 tree.type = erasedType;
duke@1 174 if (target != null) return coerce(tree, target);
duke@1 175 }
duke@1 176 return tree;
duke@1 177 }
duke@1 178
duke@1 179 /** Translate method argument list, casting each argument
duke@1 180 * to its corresponding type in a list of target types.
duke@1 181 * @param _args The method argument list.
duke@1 182 * @param parameters The list of target types.
duke@1 183 * @param varargsElement The erasure of the varargs element type,
duke@1 184 * or null if translating a non-varargs invocation
duke@1 185 */
duke@1 186 <T extends JCTree> List<T> translateArgs(List<T> _args,
duke@1 187 List<Type> parameters,
duke@1 188 Type varargsElement) {
duke@1 189 if (parameters.isEmpty()) return _args;
duke@1 190 List<T> args = _args;
duke@1 191 while (parameters.tail.nonEmpty()) {
duke@1 192 args.head = translate(args.head, parameters.head);
duke@1 193 args = args.tail;
duke@1 194 parameters = parameters.tail;
duke@1 195 }
duke@1 196 Type parameter = parameters.head;
jjg@816 197 Assert.check(varargsElement != null || args.length() == 1);
duke@1 198 if (varargsElement != null) {
duke@1 199 while (args.nonEmpty()) {
duke@1 200 args.head = translate(args.head, varargsElement);
duke@1 201 args = args.tail;
duke@1 202 }
duke@1 203 } else {
duke@1 204 args.head = translate(args.head, parameter);
duke@1 205 }
duke@1 206 return _args;
duke@1 207 }
duke@1 208
rfield@1380 209 public <T extends JCTree> List<T> translateArgs(List<T> _args,
rfield@1380 210 List<Type> parameters,
rfield@1380 211 Type varargsElement,
rfield@1380 212 Env<AttrContext> localEnv) {
rfield@1380 213 Env<AttrContext> prevEnv = env;
rfield@1380 214 try {
rfield@1380 215 env = localEnv;
rfield@1380 216 return translateArgs(_args, parameters, varargsElement);
rfield@1380 217 }
rfield@1380 218 finally {
rfield@1380 219 env = prevEnv;
rfield@1380 220 }
rfield@1380 221 }
rfield@1380 222
duke@1 223 /** Add a bridge definition and enter corresponding method symbol in
duke@1 224 * local scope of origin.
duke@1 225 *
duke@1 226 * @param pos The source code position to be used for the definition.
duke@1 227 * @param meth The method for which a bridge needs to be added
duke@1 228 * @param impl That method's implementation (possibly the method itself)
duke@1 229 * @param origin The class to which the bridge will be added
duke@1 230 * @param hypothetical
duke@1 231 * True if the bridge method is not strictly necessary in the
duke@1 232 * binary, but is represented in the symbol table to detect
duke@1 233 * erasure clashes.
duke@1 234 * @param bridges The list buffer to which the bridge will be added
duke@1 235 */
duke@1 236 void addBridge(DiagnosticPosition pos,
duke@1 237 MethodSymbol meth,
duke@1 238 MethodSymbol impl,
duke@1 239 ClassSymbol origin,
duke@1 240 boolean hypothetical,
duke@1 241 ListBuffer<JCTree> bridges) {
duke@1 242 make.at(pos);
duke@1 243 Type origType = types.memberType(origin.type, meth);
duke@1 244 Type origErasure = erasure(origType);
duke@1 245
duke@1 246 // Create a bridge method symbol and a bridge definition without a body.
duke@1 247 Type bridgeType = meth.erasure(types);
duke@1 248 long flags = impl.flags() & AccessFlags | SYNTHETIC | BRIDGE;
duke@1 249 if (hypothetical) flags |= HYPOTHETICAL;
duke@1 250 MethodSymbol bridge = new MethodSymbol(flags,
duke@1 251 meth.name,
duke@1 252 bridgeType,
duke@1 253 origin);
duke@1 254 if (!hypothetical) {
duke@1 255 JCMethodDecl md = make.MethodDef(bridge, null);
duke@1 256
duke@1 257 // The bridge calls this.impl(..), if we have an implementation
duke@1 258 // in the current class, super.impl(...) otherwise.
duke@1 259 JCExpression receiver = (impl.owner == origin)
duke@1 260 ? make.This(origin.erasure(types))
duke@1 261 : make.Super(types.supertype(origin.type).tsym.erasure(types), origin);
duke@1 262
duke@1 263 // The type returned from the original method.
duke@1 264 Type calltype = erasure(impl.type.getReturnType());
duke@1 265
duke@1 266 // Construct a call of this.impl(params), or super.impl(params),
duke@1 267 // casting params and possibly results as needed.
duke@1 268 JCExpression call =
duke@1 269 make.Apply(
duke@1 270 null,
duke@1 271 make.Select(receiver, impl).setType(calltype),
duke@1 272 translateArgs(make.Idents(md.params), origErasure.getParameterTypes(), null))
duke@1 273 .setType(calltype);
jjg@1374 274 JCStatement stat = (origErasure.getReturnType().hasTag(VOID))
duke@1 275 ? make.Exec(call)
duke@1 276 : make.Return(coerce(call, bridgeType.getReturnType()));
duke@1 277 md.body = make.Block(0, List.of(stat));
duke@1 278
duke@1 279 // Add bridge to `bridges' buffer
duke@1 280 bridges.append(md);
duke@1 281 }
duke@1 282
duke@1 283 // Add bridge to scope of enclosing class and `overridden' table.
duke@1 284 origin.members().enter(bridge);
duke@1 285 overridden.put(bridge, meth);
duke@1 286 }
duke@1 287
duke@1 288 /** Add bridge if given symbol is a non-private, non-static member
duke@1 289 * of the given class, which is either defined in the class or non-final
duke@1 290 * inherited, and one of the two following conditions holds:
duke@1 291 * 1. The method's type changes in the given class, as compared to the
duke@1 292 * class where the symbol was defined, (in this case
duke@1 293 * we have extended a parameterized class with non-trivial parameters).
duke@1 294 * 2. The method has an implementation with a different erased return type.
duke@1 295 * (in this case we have used co-variant returns).
duke@1 296 * If a bridge already exists in some other class, no new bridge is added.
duke@1 297 * Instead, it is checked that the bridge symbol overrides the method symbol.
duke@1 298 * (Spec ???).
duke@1 299 * todo: what about bridges for privates???
duke@1 300 *
duke@1 301 * @param pos The source code position to be used for the definition.
duke@1 302 * @param sym The symbol for which a bridge might have to be added.
duke@1 303 * @param origin The class in which the bridge would go.
duke@1 304 * @param bridges The list buffer to which the bridge would be added.
duke@1 305 */
duke@1 306 void addBridgeIfNeeded(DiagnosticPosition pos,
duke@1 307 Symbol sym,
duke@1 308 ClassSymbol origin,
duke@1 309 ListBuffer<JCTree> bridges) {
duke@1 310 if (sym.kind == MTH &&
duke@1 311 sym.name != names.init &&
mcimadamore@673 312 (sym.flags() & (PRIVATE | STATIC)) == 0 &&
mcimadamore@673 313 (sym.flags() & (SYNTHETIC | OVERRIDE_BRIDGE)) != SYNTHETIC &&
duke@1 314 sym.isMemberOf(origin, types))
duke@1 315 {
duke@1 316 MethodSymbol meth = (MethodSymbol)sym;
duke@1 317 MethodSymbol bridge = meth.binaryImplementation(origin, types);
mcimadamore@673 318 MethodSymbol impl = meth.implementation(origin, types, true, overrideBridgeFilter);
duke@1 319 if (bridge == null ||
duke@1 320 bridge == meth ||
duke@1 321 (impl != null && !bridge.owner.isSubClass(impl.owner, types))) {
duke@1 322 // No bridge was added yet.
duke@1 323 if (impl != null && isBridgeNeeded(meth, impl, origin.type)) {
duke@1 324 addBridge(pos, meth, impl, origin, bridge==impl, bridges);
duke@1 325 } else if (impl == meth
duke@1 326 && impl.owner != origin
duke@1 327 && (impl.flags() & FINAL) == 0
duke@1 328 && (meth.flags() & (ABSTRACT|PUBLIC)) == PUBLIC
duke@1 329 && (origin.flags() & PUBLIC) > (impl.owner.flags() & PUBLIC)) {
duke@1 330 // this is to work around a horrible but permanent
duke@1 331 // reflection design error.
duke@1 332 addBridge(pos, meth, impl, origin, false, bridges);
duke@1 333 }
mcimadamore@673 334 } else if ((bridge.flags() & (SYNTHETIC | OVERRIDE_BRIDGE)) == SYNTHETIC) {
duke@1 335 MethodSymbol other = overridden.get(bridge);
duke@1 336 if (other != null && other != meth) {
duke@1 337 if (impl == null || !impl.overrides(other, origin, types, true)) {
duke@1 338 // Bridge for other symbol pair was added
duke@1 339 log.error(pos, "name.clash.same.erasure.no.override",
duke@1 340 other, other.location(origin.type, types),
duke@1 341 meth, meth.location(origin.type, types));
duke@1 342 }
duke@1 343 }
duke@1 344 } else if (!bridge.overrides(meth, origin, types, true)) {
duke@1 345 // Accidental binary override without source override.
duke@1 346 if (bridge.owner == origin ||
duke@1 347 types.asSuper(bridge.owner.type, meth.owner) == null)
duke@1 348 // Don't diagnose the problem if it would already
duke@1 349 // have been reported in the superclass
duke@1 350 log.error(pos, "name.clash.same.erasure.no.override",
duke@1 351 bridge, bridge.location(origin.type, types),
duke@1 352 meth, meth.location(origin.type, types));
duke@1 353 }
duke@1 354 }
duke@1 355 }
duke@1 356 // where
mcimadamore@673 357 Filter<Symbol> overrideBridgeFilter = new Filter<Symbol>() {
mcimadamore@673 358 public boolean accepts(Symbol s) {
mcimadamore@673 359 return (s.flags() & (SYNTHETIC | OVERRIDE_BRIDGE)) != SYNTHETIC;
mcimadamore@673 360 }
mcimadamore@673 361 };
duke@1 362 /**
duke@1 363 * @param method The symbol for which a bridge might have to be added
duke@1 364 * @param impl The implementation of method
duke@1 365 * @param dest The type in which the bridge would go
duke@1 366 */
duke@1 367 private boolean isBridgeNeeded(MethodSymbol method,
duke@1 368 MethodSymbol impl,
duke@1 369 Type dest) {
duke@1 370 if (impl != method) {
duke@1 371 // If either method or impl have different erasures as
duke@1 372 // members of dest, a bridge is needed.
duke@1 373 Type method_erasure = method.erasure(types);
duke@1 374 if (!isSameMemberWhenErased(dest, method, method_erasure))
duke@1 375 return true;
duke@1 376 Type impl_erasure = impl.erasure(types);
duke@1 377 if (!isSameMemberWhenErased(dest, impl, impl_erasure))
duke@1 378 return true;
duke@1 379
duke@1 380 // If the erasure of the return type is different, a
duke@1 381 // bridge is needed.
duke@1 382 return !types.isSameType(impl_erasure.getReturnType(),
duke@1 383 method_erasure.getReturnType());
duke@1 384 } else {
duke@1 385 // method and impl are the same...
duke@1 386 if ((method.flags() & ABSTRACT) != 0) {
duke@1 387 // ...and abstract so a bridge is not needed.
duke@1 388 // Concrete subclasses will bridge as needed.
duke@1 389 return false;
duke@1 390 }
duke@1 391
duke@1 392 // The erasure of the return type is always the same
duke@1 393 // for the same symbol. Reducing the three tests in
duke@1 394 // the other branch to just one:
duke@1 395 return !isSameMemberWhenErased(dest, method, method.erasure(types));
duke@1 396 }
duke@1 397 }
duke@1 398 /**
duke@1 399 * Lookup the method as a member of the type. Compare the
duke@1 400 * erasures.
duke@1 401 * @param type the class where to look for the method
duke@1 402 * @param method the method to look for in class
duke@1 403 * @param erasure the erasure of method
duke@1 404 */
duke@1 405 private boolean isSameMemberWhenErased(Type type,
duke@1 406 MethodSymbol method,
duke@1 407 Type erasure) {
duke@1 408 return types.isSameType(erasure(types.memberType(type, method)),
duke@1 409 erasure);
duke@1 410 }
duke@1 411
duke@1 412 void addBridges(DiagnosticPosition pos,
duke@1 413 TypeSymbol i,
duke@1 414 ClassSymbol origin,
duke@1 415 ListBuffer<JCTree> bridges) {
duke@1 416 for (Scope.Entry e = i.members().elems; e != null; e = e.sibling)
duke@1 417 addBridgeIfNeeded(pos, e.sym, origin, bridges);
duke@1 418 for (List<Type> l = types.interfaces(i.type); l.nonEmpty(); l = l.tail)
duke@1 419 addBridges(pos, l.head.tsym, origin, bridges);
duke@1 420 }
duke@1 421
duke@1 422 /** Add all necessary bridges to some class appending them to list buffer.
duke@1 423 * @param pos The source code position to be used for the bridges.
duke@1 424 * @param origin The class in which the bridges go.
duke@1 425 * @param bridges The list buffer to which the bridges are added.
duke@1 426 */
duke@1 427 void addBridges(DiagnosticPosition pos, ClassSymbol origin, ListBuffer<JCTree> bridges) {
duke@1 428 Type st = types.supertype(origin.type);
jjg@1374 429 while (st.hasTag(CLASS)) {
duke@1 430 // if (isSpecialization(st))
duke@1 431 addBridges(pos, st.tsym, origin, bridges);
duke@1 432 st = types.supertype(st);
duke@1 433 }
duke@1 434 for (List<Type> l = types.interfaces(origin.type); l.nonEmpty(); l = l.tail)
duke@1 435 // if (isSpecialization(l.head))
duke@1 436 addBridges(pos, l.head.tsym, origin, bridges);
duke@1 437 }
duke@1 438
duke@1 439 /* ************************************************************************
duke@1 440 * Visitor methods
duke@1 441 *************************************************************************/
duke@1 442
duke@1 443 /** Visitor argument: proto-type.
duke@1 444 */
duke@1 445 private Type pt;
duke@1 446
duke@1 447 /** Visitor method: perform a type translation on tree.
duke@1 448 */
duke@1 449 public <T extends JCTree> T translate(T tree, Type pt) {
duke@1 450 Type prevPt = this.pt;
duke@1 451 try {
duke@1 452 this.pt = pt;
duke@1 453 return translate(tree);
duke@1 454 } finally {
duke@1 455 this.pt = prevPt;
duke@1 456 }
duke@1 457 }
duke@1 458
duke@1 459 /** Visitor method: perform a type translation on list of trees.
duke@1 460 */
duke@1 461 public <T extends JCTree> List<T> translate(List<T> trees, Type pt) {
duke@1 462 Type prevPt = this.pt;
duke@1 463 List<T> res;
duke@1 464 try {
duke@1 465 this.pt = pt;
duke@1 466 res = translate(trees);
duke@1 467 } finally {
duke@1 468 this.pt = prevPt;
duke@1 469 }
duke@1 470 return res;
duke@1 471 }
duke@1 472
duke@1 473 public void visitClassDef(JCClassDecl tree) {
duke@1 474 translateClass(tree.sym);
duke@1 475 result = tree;
duke@1 476 }
duke@1 477
rfield@1380 478 JCTree currentMethod = null;
duke@1 479 public void visitMethodDef(JCMethodDecl tree) {
rfield@1380 480 JCTree previousMethod = currentMethod;
duke@1 481 try {
duke@1 482 currentMethod = tree;
duke@1 483 tree.restype = translate(tree.restype, null);
duke@1 484 tree.typarams = List.nil();
duke@1 485 tree.params = translateVarDefs(tree.params);
duke@1 486 tree.thrown = translate(tree.thrown, null);
duke@1 487 tree.body = translate(tree.body, tree.sym.erasure(types).getReturnType());
duke@1 488 tree.type = erasure(tree.type);
duke@1 489 result = tree;
duke@1 490 } finally {
duke@1 491 currentMethod = previousMethod;
duke@1 492 }
duke@1 493
duke@1 494 // Check that we do not introduce a name clash by erasing types.
duke@1 495 for (Scope.Entry e = tree.sym.owner.members().lookup(tree.name);
duke@1 496 e.sym != null;
duke@1 497 e = e.next()) {
duke@1 498 if (e.sym != tree.sym &&
duke@1 499 types.isSameType(erasure(e.sym.type), tree.type)) {
duke@1 500 log.error(tree.pos(),
duke@1 501 "name.clash.same.erasure", tree.sym,
duke@1 502 e.sym);
duke@1 503 return;
duke@1 504 }
duke@1 505 }
duke@1 506 }
duke@1 507
duke@1 508 public void visitVarDef(JCVariableDecl tree) {
duke@1 509 tree.vartype = translate(tree.vartype, null);
duke@1 510 tree.init = translate(tree.init, tree.sym.erasure(types));
duke@1 511 tree.type = erasure(tree.type);
duke@1 512 result = tree;
duke@1 513 }
duke@1 514
duke@1 515 public void visitDoLoop(JCDoWhileLoop tree) {
duke@1 516 tree.body = translate(tree.body);
duke@1 517 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 518 result = tree;
duke@1 519 }
duke@1 520
duke@1 521 public void visitWhileLoop(JCWhileLoop tree) {
duke@1 522 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 523 tree.body = translate(tree.body);
duke@1 524 result = tree;
duke@1 525 }
duke@1 526
duke@1 527 public void visitForLoop(JCForLoop tree) {
duke@1 528 tree.init = translate(tree.init, null);
duke@1 529 if (tree.cond != null)
duke@1 530 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 531 tree.step = translate(tree.step, null);
duke@1 532 tree.body = translate(tree.body);
duke@1 533 result = tree;
duke@1 534 }
duke@1 535
duke@1 536 public void visitForeachLoop(JCEnhancedForLoop tree) {
duke@1 537 tree.var = translate(tree.var, null);
duke@1 538 Type iterableType = tree.expr.type;
duke@1 539 tree.expr = translate(tree.expr, erasure(tree.expr.type));
duke@1 540 if (types.elemtype(tree.expr.type) == null)
duke@1 541 tree.expr.type = iterableType; // preserve type for Lower
duke@1 542 tree.body = translate(tree.body);
duke@1 543 result = tree;
duke@1 544 }
duke@1 545
rfield@1380 546 public void visitLambda(JCLambda tree) {
rfield@1380 547 JCTree prevMethod = currentMethod;
rfield@1380 548 try {
rfield@1380 549 currentMethod = null;
rfield@1380 550 tree.params = translate(tree.params);
rfield@1380 551 tree.body = translate(tree.body, null);
rfield@1380 552 //save non-erased target
rfield@1380 553 tree.targetType = tree.type;
rfield@1380 554 tree.type = erasure(tree.type);
rfield@1380 555 result = tree;
rfield@1380 556 }
rfield@1380 557 finally {
rfield@1380 558 currentMethod = prevMethod;
rfield@1380 559 }
rfield@1380 560 }
rfield@1380 561
duke@1 562 public void visitSwitch(JCSwitch tree) {
duke@1 563 Type selsuper = types.supertype(tree.selector.type);
duke@1 564 boolean enumSwitch = selsuper != null &&
duke@1 565 selsuper.tsym == syms.enumSym;
duke@1 566 Type target = enumSwitch ? erasure(tree.selector.type) : syms.intType;
duke@1 567 tree.selector = translate(tree.selector, target);
duke@1 568 tree.cases = translateCases(tree.cases);
duke@1 569 result = tree;
duke@1 570 }
duke@1 571
duke@1 572 public void visitCase(JCCase tree) {
duke@1 573 tree.pat = translate(tree.pat, null);
duke@1 574 tree.stats = translate(tree.stats);
duke@1 575 result = tree;
duke@1 576 }
duke@1 577
duke@1 578 public void visitSynchronized(JCSynchronized tree) {
duke@1 579 tree.lock = translate(tree.lock, erasure(tree.lock.type));
duke@1 580 tree.body = translate(tree.body);
duke@1 581 result = tree;
duke@1 582 }
duke@1 583
darcy@609 584 public void visitTry(JCTry tree) {
darcy@609 585 tree.resources = translate(tree.resources, syms.autoCloseableType);
darcy@609 586 tree.body = translate(tree.body);
darcy@609 587 tree.catchers = translateCatchers(tree.catchers);
darcy@609 588 tree.finalizer = translate(tree.finalizer);
darcy@609 589 result = tree;
darcy@609 590 }
darcy@609 591
duke@1 592 public void visitConditional(JCConditional tree) {
duke@1 593 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 594 tree.truepart = translate(tree.truepart, erasure(tree.type));
duke@1 595 tree.falsepart = translate(tree.falsepart, erasure(tree.type));
duke@1 596 tree.type = erasure(tree.type);
mcimadamore@120 597 result = retype(tree, tree.type, pt);
duke@1 598 }
duke@1 599
duke@1 600 public void visitIf(JCIf tree) {
duke@1 601 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 602 tree.thenpart = translate(tree.thenpart);
duke@1 603 tree.elsepart = translate(tree.elsepart);
duke@1 604 result = tree;
duke@1 605 }
duke@1 606
duke@1 607 public void visitExec(JCExpressionStatement tree) {
duke@1 608 tree.expr = translate(tree.expr, null);
duke@1 609 result = tree;
duke@1 610 }
duke@1 611
duke@1 612 public void visitReturn(JCReturn tree) {
rfield@1380 613 tree.expr = translate(tree.expr, currentMethod != null ? types.erasure(currentMethod.type).getReturnType() : null);
duke@1 614 result = tree;
duke@1 615 }
duke@1 616
duke@1 617 public void visitThrow(JCThrow tree) {
duke@1 618 tree.expr = translate(tree.expr, erasure(tree.expr.type));
duke@1 619 result = tree;
duke@1 620 }
duke@1 621
duke@1 622 public void visitAssert(JCAssert tree) {
duke@1 623 tree.cond = translate(tree.cond, syms.booleanType);
duke@1 624 if (tree.detail != null)
duke@1 625 tree.detail = translate(tree.detail, erasure(tree.detail.type));
duke@1 626 result = tree;
duke@1 627 }
duke@1 628
duke@1 629 public void visitApply(JCMethodInvocation tree) {
duke@1 630 tree.meth = translate(tree.meth, null);
duke@1 631 Symbol meth = TreeInfo.symbol(tree.meth);
duke@1 632 Type mt = meth.erasure(types);
duke@1 633 List<Type> argtypes = mt.getParameterTypes();
duke@1 634 if (allowEnums &&
duke@1 635 meth.name==names.init &&
duke@1 636 meth.owner == syms.enumSym)
duke@1 637 argtypes = argtypes.tail.tail;
duke@1 638 if (tree.varargsElement != null)
duke@1 639 tree.varargsElement = types.erasure(tree.varargsElement);
duke@1 640 else
jjg@816 641 Assert.check(tree.args.length() == argtypes.length());
duke@1 642 tree.args = translateArgs(tree.args, argtypes, tree.varargsElement);
duke@1 643
rfield@1380 644 tree.type = types.erasure(tree.type);
duke@1 645 // Insert casts of method invocation results as needed.
duke@1 646 result = retype(tree, mt.getReturnType(), pt);
duke@1 647 }
duke@1 648
duke@1 649 public void visitNewClass(JCNewClass tree) {
duke@1 650 if (tree.encl != null)
duke@1 651 tree.encl = translate(tree.encl, erasure(tree.encl.type));
duke@1 652 tree.clazz = translate(tree.clazz, null);
duke@1 653 if (tree.varargsElement != null)
duke@1 654 tree.varargsElement = types.erasure(tree.varargsElement);
duke@1 655 tree.args = translateArgs(
duke@1 656 tree.args, tree.constructor.erasure(types).getParameterTypes(), tree.varargsElement);
duke@1 657 tree.def = translate(tree.def, null);
rfield@1380 658 if (tree.constructorType != null)
rfield@1380 659 tree.constructorType = erasure(tree.constructorType);
duke@1 660 tree.type = erasure(tree.type);
duke@1 661 result = tree;
duke@1 662 }
duke@1 663
duke@1 664 public void visitNewArray(JCNewArray tree) {
duke@1 665 tree.elemtype = translate(tree.elemtype, null);
duke@1 666 translate(tree.dims, syms.intType);
jjg@511 667 if (tree.type != null) {
jjg@511 668 tree.elems = translate(tree.elems, erasure(types.elemtype(tree.type)));
jjg@511 669 tree.type = erasure(tree.type);
jjg@511 670 } else {
jjg@511 671 tree.elems = translate(tree.elems, null);
jjg@511 672 }
duke@1 673
duke@1 674 result = tree;
duke@1 675 }
duke@1 676
duke@1 677 public void visitParens(JCParens tree) {
duke@1 678 tree.expr = translate(tree.expr, pt);
duke@1 679 tree.type = erasure(tree.type);
duke@1 680 result = tree;
duke@1 681 }
duke@1 682
duke@1 683 public void visitAssign(JCAssign tree) {
duke@1 684 tree.lhs = translate(tree.lhs, null);
duke@1 685 tree.rhs = translate(tree.rhs, erasure(tree.lhs.type));
duke@1 686 tree.type = erasure(tree.type);
duke@1 687 result = tree;
duke@1 688 }
duke@1 689
duke@1 690 public void visitAssignop(JCAssignOp tree) {
mcimadamore@360 691 tree.lhs = translate(tree.lhs, null);
mcimadamore@133 692 tree.rhs = translate(tree.rhs, tree.operator.type.getParameterTypes().tail.head);
duke@1 693 tree.type = erasure(tree.type);
duke@1 694 result = tree;
duke@1 695 }
duke@1 696
duke@1 697 public void visitUnary(JCUnary tree) {
duke@1 698 tree.arg = translate(tree.arg, tree.operator.type.getParameterTypes().head);
duke@1 699 result = tree;
duke@1 700 }
duke@1 701
duke@1 702 public void visitBinary(JCBinary tree) {
duke@1 703 tree.lhs = translate(tree.lhs, tree.operator.type.getParameterTypes().head);
duke@1 704 tree.rhs = translate(tree.rhs, tree.operator.type.getParameterTypes().tail.head);
duke@1 705 result = tree;
duke@1 706 }
duke@1 707
duke@1 708 public void visitTypeCast(JCTypeCast tree) {
duke@1 709 tree.clazz = translate(tree.clazz, null);
duke@1 710 tree.type = erasure(tree.type);
duke@1 711 tree.expr = translate(tree.expr, tree.type);
duke@1 712 result = tree;
duke@1 713 }
duke@1 714
duke@1 715 public void visitTypeTest(JCInstanceOf tree) {
duke@1 716 tree.expr = translate(tree.expr, null);
duke@1 717 tree.clazz = translate(tree.clazz, null);
duke@1 718 result = tree;
duke@1 719 }
duke@1 720
duke@1 721 public void visitIndexed(JCArrayAccess tree) {
duke@1 722 tree.indexed = translate(tree.indexed, erasure(tree.indexed.type));
duke@1 723 tree.index = translate(tree.index, syms.intType);
duke@1 724
duke@1 725 // Insert casts of indexed expressions as needed.
duke@1 726 result = retype(tree, types.elemtype(tree.indexed.type), pt);
duke@1 727 }
duke@1 728
duke@1 729 // There ought to be nothing to rewrite here;
duke@1 730 // we don't generate code.
duke@1 731 public void visitAnnotation(JCAnnotation tree) {
duke@1 732 result = tree;
duke@1 733 }
duke@1 734
duke@1 735 public void visitIdent(JCIdent tree) {
duke@1 736 Type et = tree.sym.erasure(types);
duke@1 737
duke@1 738 // Map type variables to their bounds.
jjg@1374 739 if (tree.sym.kind == TYP && tree.sym.type.hasTag(TYPEVAR)) {
duke@1 740 result = make.at(tree.pos).Type(et);
duke@1 741 } else
duke@1 742 // Map constants expressions to themselves.
duke@1 743 if (tree.type.constValue() != null) {
duke@1 744 result = tree;
duke@1 745 }
duke@1 746 // Insert casts of variable uses as needed.
duke@1 747 else if (tree.sym.kind == VAR) {
duke@1 748 result = retype(tree, et, pt);
duke@1 749 }
duke@1 750 else {
duke@1 751 tree.type = erasure(tree.type);
duke@1 752 result = tree;
duke@1 753 }
duke@1 754 }
duke@1 755
duke@1 756 public void visitSelect(JCFieldAccess tree) {
duke@1 757 Type t = tree.selected.type;
jjg@1374 758 while (t.hasTag(TYPEVAR))
mcimadamore@23 759 t = t.getUpperBound();
mcimadamore@23 760 if (t.isCompound()) {
duke@1 761 if ((tree.sym.flags() & IPROXY) != 0) {
duke@1 762 tree.sym = ((MethodSymbol)tree.sym).
duke@1 763 implemented((TypeSymbol)tree.sym.owner, types);
duke@1 764 }
mcimadamore@769 765 tree.selected = coerce(
mcimadamore@23 766 translate(tree.selected, erasure(tree.selected.type)),
duke@1 767 erasure(tree.sym.owner.type));
duke@1 768 } else
duke@1 769 tree.selected = translate(tree.selected, erasure(t));
duke@1 770
duke@1 771 // Map constants expressions to themselves.
duke@1 772 if (tree.type.constValue() != null) {
duke@1 773 result = tree;
duke@1 774 }
duke@1 775 // Insert casts of variable uses as needed.
duke@1 776 else if (tree.sym.kind == VAR) {
duke@1 777 result = retype(tree, tree.sym.erasure(types), pt);
duke@1 778 }
duke@1 779 else {
duke@1 780 tree.type = erasure(tree.type);
duke@1 781 result = tree;
duke@1 782 }
duke@1 783 }
duke@1 784
rfield@1380 785 public void visitReference(JCMemberReference tree) {
rfield@1380 786 tree.expr = translate(tree.expr, null);
rfield@1380 787 //save non-erased target
rfield@1380 788 tree.targetType = tree.type;
rfield@1380 789 tree.type = erasure(tree.type);
rfield@1380 790 result = tree;
rfield@1380 791 }
rfield@1380 792
duke@1 793 public void visitTypeArray(JCArrayTypeTree tree) {
duke@1 794 tree.elemtype = translate(tree.elemtype, null);
duke@1 795 tree.type = erasure(tree.type);
duke@1 796 result = tree;
duke@1 797 }
duke@1 798
duke@1 799 /** Visitor method for parameterized types.
duke@1 800 */
duke@1 801 public void visitTypeApply(JCTypeApply tree) {
jjg@308 802 JCTree clazz = translate(tree.clazz, null);
jjg@308 803 result = clazz;
duke@1 804 }
duke@1 805
duke@1 806 /**************************************************************************
duke@1 807 * utility methods
duke@1 808 *************************************************************************/
duke@1 809
duke@1 810 private Type erasure(Type t) {
duke@1 811 return types.erasure(t);
duke@1 812 }
duke@1 813
mcimadamore@673 814 private boolean boundsRestricted(ClassSymbol c) {
mcimadamore@673 815 Type st = types.supertype(c.type);
mcimadamore@673 816 if (st.isParameterized()) {
mcimadamore@673 817 List<Type> actuals = st.allparams();
mcimadamore@673 818 List<Type> formals = st.tsym.type.allparams();
mcimadamore@673 819 while (!actuals.isEmpty() && !formals.isEmpty()) {
mcimadamore@673 820 Type actual = actuals.head;
mcimadamore@673 821 Type formal = formals.head;
mcimadamore@673 822
mcimadamore@673 823 if (!types.isSameType(types.erasure(actual),
mcimadamore@673 824 types.erasure(formal)))
mcimadamore@673 825 return true;
mcimadamore@673 826
mcimadamore@673 827 actuals = actuals.tail;
mcimadamore@673 828 formals = formals.tail;
mcimadamore@673 829 }
mcimadamore@673 830 }
mcimadamore@673 831 return false;
mcimadamore@673 832 }
mcimadamore@673 833
mcimadamore@673 834 private List<JCTree> addOverrideBridgesIfNeeded(DiagnosticPosition pos,
mcimadamore@673 835 final ClassSymbol c) {
mcimadamore@673 836 ListBuffer<JCTree> buf = ListBuffer.lb();
mcimadamore@673 837 if (c.isInterface() || !boundsRestricted(c))
mcimadamore@673 838 return buf.toList();
mcimadamore@673 839 Type t = types.supertype(c.type);
mcimadamore@673 840 Scope s = t.tsym.members();
mcimadamore@673 841 if (s.elems != null) {
mcimadamore@673 842 for (Symbol sym : s.getElements(new NeedsOverridBridgeFilter(c))) {
mcimadamore@673 843
mcimadamore@673 844 MethodSymbol m = (MethodSymbol)sym;
mcimadamore@673 845 MethodSymbol member = (MethodSymbol)m.asMemberOf(c.type, types);
mcimadamore@673 846 MethodSymbol impl = m.implementation(c, types, false);
mcimadamore@673 847
mcimadamore@673 848 if ((impl == null || impl.owner != c) &&
mcimadamore@673 849 !types.isSameType(member.erasure(types), m.erasure(types))) {
mcimadamore@673 850 addOverrideBridges(pos, m, member, c, buf);
mcimadamore@673 851 }
mcimadamore@673 852 }
mcimadamore@673 853 }
mcimadamore@673 854 return buf.toList();
mcimadamore@673 855 }
mcimadamore@673 856 // where
mcimadamore@673 857 class NeedsOverridBridgeFilter implements Filter<Symbol> {
mcimadamore@673 858
mcimadamore@673 859 ClassSymbol c;
mcimadamore@673 860
mcimadamore@673 861 NeedsOverridBridgeFilter(ClassSymbol c) {
mcimadamore@673 862 this.c = c;
mcimadamore@673 863 }
mcimadamore@673 864 public boolean accepts(Symbol s) {
mcimadamore@673 865 return s.kind == MTH &&
mcimadamore@673 866 !s.isConstructor() &&
mcimadamore@673 867 s.isInheritedIn(c, types) &&
mcimadamore@673 868 (s.flags() & FINAL) == 0 &&
mcimadamore@673 869 (s.flags() & (SYNTHETIC | OVERRIDE_BRIDGE)) != SYNTHETIC;
mcimadamore@673 870 }
mcimadamore@673 871 }
mcimadamore@673 872
mcimadamore@673 873 private void addOverrideBridges(DiagnosticPosition pos,
mcimadamore@673 874 MethodSymbol impl,
mcimadamore@673 875 MethodSymbol member,
mcimadamore@673 876 ClassSymbol c,
mcimadamore@673 877 ListBuffer<JCTree> bridges) {
mcimadamore@673 878 Type implErasure = impl.erasure(types);
mcimadamore@673 879 long flags = (impl.flags() & AccessFlags) | SYNTHETIC | BRIDGE | OVERRIDE_BRIDGE;
mcimadamore@673 880 member = new MethodSymbol(flags, member.name, member.type, c);
mcimadamore@673 881 JCMethodDecl md = make.MethodDef(member, null);
mcimadamore@673 882 JCExpression receiver = make.Super(types.supertype(c.type).tsym.erasure(types), c);
mcimadamore@673 883 Type calltype = erasure(impl.type.getReturnType());
mcimadamore@673 884 JCExpression call =
mcimadamore@673 885 make.Apply(null,
mcimadamore@673 886 make.Select(receiver, impl).setType(calltype),
mcimadamore@673 887 translateArgs(make.Idents(md.params),
mcimadamore@673 888 implErasure.getParameterTypes(), null))
mcimadamore@673 889 .setType(calltype);
jjg@1374 890 JCStatement stat = (member.getReturnType().hasTag(VOID))
mcimadamore@673 891 ? make.Exec(call)
mcimadamore@673 892 : make.Return(coerce(call, member.erasure(types).getReturnType()));
mcimadamore@673 893 md.body = make.Block(0, List.of(stat));
mcimadamore@673 894 c.members().enter(member);
mcimadamore@673 895 bridges.append(md);
mcimadamore@673 896 }
mcimadamore@673 897
duke@1 898 /**************************************************************************
duke@1 899 * main method
duke@1 900 *************************************************************************/
duke@1 901
duke@1 902 private Env<AttrContext> env;
duke@1 903
duke@1 904 void translateClass(ClassSymbol c) {
duke@1 905 Type st = types.supertype(c.type);
duke@1 906
duke@1 907 // process superclass before derived
jjg@1374 908 if (st.hasTag(CLASS))
duke@1 909 translateClass((ClassSymbol)st.tsym);
duke@1 910
duke@1 911 Env<AttrContext> myEnv = enter.typeEnvs.remove(c);
duke@1 912 if (myEnv == null)
duke@1 913 return;
duke@1 914 Env<AttrContext> oldEnv = env;
duke@1 915 try {
duke@1 916 env = myEnv;
duke@1 917 // class has not been translated yet
duke@1 918
duke@1 919 TreeMaker savedMake = make;
duke@1 920 Type savedPt = pt;
duke@1 921 make = make.forToplevel(env.toplevel);
duke@1 922 pt = null;
duke@1 923 try {
duke@1 924 JCClassDecl tree = (JCClassDecl) env.tree;
duke@1 925 tree.typarams = List.nil();
duke@1 926 super.visitClassDef(tree);
duke@1 927 make.at(tree.pos);
duke@1 928 if (addBridges) {
duke@1 929 ListBuffer<JCTree> bridges = new ListBuffer<JCTree>();
mcimadamore@730 930 if (false) //see CR: 6996415
mcimadamore@730 931 bridges.appendList(addOverrideBridgesIfNeeded(tree, c));
duke@1 932 if ((tree.sym.flags() & INTERFACE) == 0)
duke@1 933 addBridges(tree.pos(), tree.sym, bridges);
duke@1 934 tree.defs = bridges.toList().prependList(tree.defs);
duke@1 935 }
duke@1 936 tree.type = erasure(tree.type);
duke@1 937 } finally {
duke@1 938 make = savedMake;
duke@1 939 pt = savedPt;
duke@1 940 }
duke@1 941 } finally {
duke@1 942 env = oldEnv;
duke@1 943 }
duke@1 944 }
duke@1 945
duke@1 946 /** Translate a toplevel class definition.
duke@1 947 * @param cdef The definition to be translated.
duke@1 948 */
duke@1 949 public JCTree translateTopLevelClass(JCTree cdef, TreeMaker make) {
duke@1 950 // note that this method does NOT support recursion.
duke@1 951 this.make = make;
duke@1 952 pt = null;
duke@1 953 return translate(cdef, null);
duke@1 954 }
duke@1 955 }

mercurial