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

Mon, 15 Apr 2013 14:17:30 +0100

author
mcimadamore
date
Mon, 15 Apr 2013 14:17:30 +0100
changeset 1696
c2315af9cc28
parent 1690
76537856a54e
child 1785
92e420e9807d
permissions
-rw-r--r--

8011392: Missing checkcast when casting to intersection type
Summary: javac should emit a checkcast for each additional target type specified in an intersection type cast
Reviewed-by: jjg

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

mercurial