8187805: bogus RuntimeVisibleTypeAnnotations for unused local in a block
Reviewed-by: sadayapalam
This commit is contained in:
parent
9927f9eab3
commit
e2f5722888
src/jdk.compiler/share/classes/com/sun/tools/javac
test/langtools/tools/javac/T8187805
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2018, 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
|
||||
@ -312,6 +312,7 @@ public class TypeAnnotationPosition {
|
||||
Assert.check(!hasExceptionIndex(), "exception_index already set");
|
||||
Assert.check(exception_index >= 0, "Expected a valid index into exception table");
|
||||
this.exception_index = exception_index;
|
||||
this.isValidOffset = true;
|
||||
}
|
||||
|
||||
public boolean hasCatchType() {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2018, 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
|
||||
@ -2100,15 +2100,19 @@ public class Code {
|
||||
}
|
||||
|
||||
private void fillLocalVarPosition(LocalVar lv) {
|
||||
if (lv == null || lv.sym == null || !lv.sym.hasTypeAnnotations())
|
||||
if (lv == null || lv.sym == null || lv.sym.isExceptionParameter()|| !lv.sym.hasTypeAnnotations())
|
||||
return;
|
||||
LocalVar.Range widestRange = lv.getWidestRange();
|
||||
for (Attribute.TypeCompound ta : lv.sym.getRawTypeAttributes()) {
|
||||
TypeAnnotationPosition p = ta.position;
|
||||
LocalVar.Range widestRange = lv.getWidestRange();
|
||||
p.lvarOffset = new int[] { (int)widestRange.start_pc };
|
||||
p.lvarLength = new int[] { (int)widestRange.length };
|
||||
p.lvarIndex = new int[] { (int)lv.reg };
|
||||
p.isValidOffset = true;
|
||||
if (widestRange.closed() && widestRange.length > 0) {
|
||||
p.lvarOffset = new int[] { (int)widestRange.start_pc };
|
||||
p.lvarLength = new int[] { (int)widestRange.length };
|
||||
p.lvarIndex = new int[] { (int)lv.reg };
|
||||
p.isValidOffset = true;
|
||||
} else {
|
||||
p.isValidOffset = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,88 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 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.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test 8187805
|
||||
* @summary bogus RuntimeVisibleTypeAnnotations for unused local in a block
|
||||
* @modules jdk.jdeps/com.sun.tools.classfile
|
||||
* jdk.compiler/com.sun.tools.javac.util
|
||||
* @run main BogusRTTAForUnusedVarTest
|
||||
*/
|
||||
|
||||
import com.sun.tools.classfile.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.annotation.Target;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
import com.sun.tools.classfile.Attribute;
|
||||
import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
|
||||
import com.sun.tools.classfile.TypeAnnotation;
|
||||
import com.sun.tools.classfile.TypeAnnotation.Position;
|
||||
import com.sun.tools.javac.util.Assert;
|
||||
|
||||
public class BogusRTTAForUnusedVarTest {
|
||||
|
||||
class Foo {
|
||||
void something() {
|
||||
{
|
||||
@MyAnno Object o = new Object();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Target(ElementType.TYPE_USE)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@interface MyAnno {}
|
||||
|
||||
public static void main(String args[]) throws Throwable {
|
||||
new BogusRTTAForUnusedVarTest().run();
|
||||
}
|
||||
|
||||
void run() throws Throwable {
|
||||
checkRTTA();
|
||||
}
|
||||
|
||||
void checkRTTA() throws Throwable {
|
||||
File testClasses = new File(System.getProperty("test.classes"));
|
||||
File file = new File(testClasses,
|
||||
BogusRTTAForUnusedVarTest.class.getName() + "$Foo.class");
|
||||
ClassFile classFile = ClassFile.read(file);
|
||||
for (Method m : classFile.methods) {
|
||||
if (m.getName(classFile.constant_pool).equals("something")) {
|
||||
for (Attribute a : m.attributes) {
|
||||
if (a.getName(classFile.constant_pool).equals("Code")) {
|
||||
Code_attribute code = (Code_attribute)a;
|
||||
for (Attribute codeAttrs : code.attributes) {
|
||||
if (codeAttrs.getName(classFile.constant_pool).equals("RuntimeVisibleTypeAnnotations")) {
|
||||
throw new AssertionError("no RuntimeVisibleTypeAnnotations attribute should have been generated in this case");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user