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

Mon, 07 Feb 2011 18:10:13 +0000

author
mcimadamore
date
Mon, 07 Feb 2011 18:10:13 +0000
changeset 858
96d4226bdd60
parent 816
7c537f4298fb
child 1221
c2234816495f
permissions
-rw-r--r--

7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
Summary: override clash algorithm is not implemented correctly
Reviewed-by: jjg

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

mercurial