mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 23:34:52 +02:00
8313422: test/langtools/tools/javac 144 test classes uses com.sun.tools.classfile library
Reviewed-by: asotona
This commit is contained in:
parent
8557205a82
commit
8f7e29b2cd
144 changed files with 2743 additions and 2762 deletions
|
@ -26,7 +26,12 @@
|
|||
* @bug 8129547
|
||||
* @summary Excess entries in BootstrapMethods with the same (bsm, bsmKind, bsmStaticArgs), but different dynamicArgs
|
||||
* @library /tools/javac/lib
|
||||
* @modules jdk.jdeps/com.sun.tools.classfile
|
||||
* @modules java.base/jdk.internal.classfile
|
||||
* java.base/jdk.internal.classfile.attribute
|
||||
* java.base/jdk.internal.classfile.constantpool
|
||||
* java.base/jdk.internal.classfile.instruction
|
||||
* java.base/jdk.internal.classfile.components
|
||||
* java.base/jdk.internal.classfile.impl
|
||||
* jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.code
|
||||
* jdk.compiler/com.sun.tools.javac.jvm
|
||||
|
@ -52,9 +57,8 @@ import com.sun.source.util.TaskEvent;
|
|||
import com.sun.source.util.TaskListener;
|
||||
import com.sun.source.util.TreeScanner;
|
||||
|
||||
import com.sun.tools.classfile.Attribute;
|
||||
import com.sun.tools.classfile.BootstrapMethods_attribute;
|
||||
import com.sun.tools.classfile.ClassFile;
|
||||
import jdk.internal.classfile.*;
|
||||
import jdk.internal.classfile.attribute.BootstrapMethodsAttribute;
|
||||
|
||||
import com.sun.tools.javac.api.JavacTaskImpl;
|
||||
import com.sun.tools.javac.code.Symbol;
|
||||
|
@ -111,11 +115,9 @@ public class TestBootstrapMethodsCount {
|
|||
void verifyBytecode() {
|
||||
File compiledTest = new File("Test.class");
|
||||
try {
|
||||
ClassFile cf = ClassFile.read(compiledTest);
|
||||
BootstrapMethods_attribute bsm_attr =
|
||||
(BootstrapMethods_attribute)cf
|
||||
.getAttribute(Attribute.BootstrapMethods);
|
||||
int length = bsm_attr.bootstrap_method_specifiers.length;
|
||||
ClassModel cf = Classfile.of().parse(compiledTest.toPath());
|
||||
BootstrapMethodsAttribute bsm_attr = cf.findAttribute(Attributes.BOOTSTRAP_METHODS).orElseThrow();
|
||||
int length = bsm_attr.bootstrapMethodsSize();
|
||||
if (length != 1) {
|
||||
throw new Error("Bad number of method specifiers " +
|
||||
"in BootstrapMethods attribute: " + length);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue