jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/jvm/Gen.java

-:ca063536e4a6
+:03944ee4fac4
 * have any questions.
 */
 package com.sun.tools.javac.jvm;
 import java.util.*;
+import javax.lang.model.element.ElementKind;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.code.*;
 code.crt.put(tree.body,
 CRT_BLOCK,
 startpcCrt,
 code.curPc());
-// End the scope of all local variables in variable info.
 code.endScopes(0);
 // If we exceeded limits, panic
 if (code.checkLimits(tree.pos(), log)) {
 nerrs++;
 }
 // Resolve all breaks.
 code.resolve(exitChain);
-// End the scopes of all try-local variables in variable info.
 code.endScopes(limit);
 }
 /** Generate code for a catch clause.
 *  @param tree     The catch clause.
 /* ************************************************************************
 * Visitor methods for expressions
 *************************************************************************/
 public void visitApply(JCMethodInvocation tree) {
+setTypeAnnotationPositions(tree.pos);
 // Generate code for method.
 Item m = genExpr(tree.meth, methodType);
 // Generate code for all arguments, where the expected types are
 // the parameters of the method's external type (that is, any implicit
 // outer instance of a super(...) call appears as first parameter).
 }
 code.resolve(thenExit);
 result = items.makeStackItem(pt);
 }
+private void setTypeAnnotationPositions(int treePos) {
+MethodSymbol meth = code.meth;
+for (Attribute.TypeCompound ta : meth.typeAnnotations) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset[0] = code.cp;
+}
+}
+if (code.meth.getKind() != ElementKind.CONSTRUCTOR
+&& code.meth.getKind() != ElementKind.STATIC_INIT)
+return;
+for (Attribute.TypeCompound ta : meth.owner.typeAnnotations) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset[0] = code.cp;
+}
+}
+ClassSymbol clazz = meth.enclClass();
+for (Symbol s : new com.sun.tools.javac.model.FilteredMemberList(clazz.members())) {
+if (!s.getKind().isField())
+continue;
+for (Attribute.TypeCompound ta : s.typeAnnotations) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset[0] = code.cp;
+}
+}
+}
+}
 public void visitNewClass(JCNewClass tree) {
 // Enclosing instances or anonymous classes should have been eliminated
 // by now.
 assert tree.encl == null && tree.def == null;
+setTypeAnnotationPositions(tree.pos);
 code.emitop2(new_, makeRef(tree.pos(), tree.type));
 code.emitop0(dup);
 // Generate code for all arguments, where the expected types are
 items.makeMemberItem(tree.constructor, true).invoke();
 result = items.makeStackItem(tree.type);
 }
 public void visitNewArray(JCNewArray tree) {
+setTypeAnnotationPositions(tree.pos);
 if (tree.elems != null) {
 Type elemtype = types.elemtype(tree.type);
 loadIntConst(tree.elems.length());
 Item arr = makeNewArray(tree.pos(), tree.type, 1);
 int i = 0;
 return items.makeStackItem(optype.restype);
 }
 }
 public void visitTypeCast(JCTypeCast tree) {
+setTypeAnnotationPositions(tree.pos);
 result = genExpr(tree.expr, tree.clazz.type).load();
 // Additional code is only needed if we cast to a reference type
 // which is not statically a supertype of the expression's type.
 // For basic types, the coerce(...) in genExpr(...) will do
 // the conversion.
 public void visitWildcard(JCWildcard tree) {
 throw new AssertionError(this.getClass().getName());
 }
 public void visitTypeTest(JCInstanceOf tree) {
+setTypeAnnotationPositions(tree.pos);
 genExpr(tree.expr, tree.expr.type).load();
 code.emitop2(instanceof_, makeRef(tree.pos(), tree.clazz.type));
 result = items.makeStackItem(syms.booleanType);
 }
 public void visitSelect(JCFieldAccess tree) {
 Symbol sym = tree.sym;
 if (tree.name == names._class) {
 assert target.hasClassLiterals();
+setTypeAnnotationPositions(tree.pos);
 code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type));
 result = items.makeStackItem(pt);
 return;
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/jvm/Gen.java

src/share/classes/com/sun/tools/javac/jvm/Gen.java