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

-:5c956be64b9e
+:71f35e4b93a5
 /*
-* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 if(stackMap == StackMapFormat.JSR202) {
 code.lastFrame = null;
 code.frameBeforeLast = null;
 }
-//compress exception table
+// Compress exception table
 code.compressCatchTable();
+// Fill in type annotation positions for exception parameters
+code.fillExceptionParameterPositions();
 }
 }
 private int initCode(JCMethodDecl tree, Env<GenContext> env, boolean fatcode) {
 MethodSymbol meth = tree.sym;
 /* ************************************************************************
 * 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.getRawTypeAttributes()) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset = new int[] { code.cp };
+ta.position.isValidOffset = true;
+}
+}
+if (code.meth.getKind() != javax.lang.model.element.ElementKind.CONSTRUCTOR
+&& code.meth.getKind() != javax.lang.model.element.ElementKind.STATIC_INIT)
+return;
+for (Attribute.TypeCompound ta : meth.owner.getRawTypeAttributes()) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset = new int[] { code.cp };
+ta.position.isValidOffset = true;
+}
+}
+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.getRawTypeAttributes()) {
+if (ta.position.pos == treePos) {
+ta.position.offset = code.cp;
+ta.position.lvarOffset = new int[] { code.cp };
+ta.position.isValidOffset = true;
+}
+}
+}
+}
 public void visitNewClass(JCNewClass tree) {
 // Enclosing instances or anonymous classes should have been eliminated
 // by now.
 Assert.check(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);
 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);
 }
 if (tree.name == names._class) {
 Assert.check(target.hasClassLiterals());
 code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type));
 result = items.makeStackItem(pt);
 return;
 }
 Symbol ssym = TreeInfo.symbol(tree.selected);
 // Are we selecting via super?
 boolean selectSuper =

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