Classfile api label resolver branch (openjdk#33)

asotona · web-flow · commit cb17b0f7c17a · 2022-08-19T10:32:12.000+02:00
* removed impl.LabelResolver
* labelToBci moved to CodeAttribute and impl.LabelContext
* removed labelToBci from CodeBuilder
diff --git a/src/java.base/share/classes/jdk/classfile/CodeBuilder.java b/src/java.base/share/classes/jdk/classfile/CodeBuilder.java
@@ -119,9 +119,6 @@ public sealed interface CodeBuilder
      * the current block will be the entire method body. */
     Label endLabel();
 
-    /** {@return the bytecode offset associated with the specified label} */
-    int labelToBci(Label label);
-
     /**
      * {@return the local variable slot associated with the receiver}.
      *
diff --git a/src/java.base/share/classes/jdk/classfile/CodeModel.java b/src/java.base/share/classes/jdk/classfile/CodeModel.java
@@ -31,7 +31,6 @@
 import jdk.classfile.attribute.CodeAttribute;
 import jdk.classfile.impl.BufferedCodeBuilder;
 import jdk.classfile.impl.CodeImpl;
-import jdk.classfile.impl.LabelResolver;
 import jdk.classfile.instruction.ExceptionCatch;
 
 /**
@@ -40,7 +39,7 @@
  * #elements()}).
  */
 public sealed interface CodeModel
-        extends CompoundElement<CodeElement>, AttributedElement, MethodElement, LabelResolver
+        extends CompoundElement<CodeElement>, AttributedElement, MethodElement
         permits CodeAttribute, BufferedCodeBuilder.Model, CodeImpl {
 
     /**
diff --git a/src/java.base/share/classes/jdk/classfile/attribute/CodeAttribute.java b/src/java.base/share/classes/jdk/classfile/attribute/CodeAttribute.java
@@ -27,6 +27,7 @@
 
 import jdk.classfile.Attribute;
 import jdk.classfile.CodeModel;
+import jdk.classfile.Label;
 import jdk.classfile.impl.BoundAttribute;
 
 /**
@@ -47,4 +48,6 @@ public sealed interface CodeAttribute extends Attribute<CodeAttribute>, CodeMode
      * {@return the bytes (bytecode) of the code array}
      */
     byte[] codeArray();
+
+    int labelToBci(Label label);
 }
diff --git a/src/java.base/share/classes/jdk/classfile/impl/AbstractBoundLocalVariable.java b/src/java.base/share/classes/jdk/classfile/impl/AbstractBoundLocalVariable.java
@@ -93,9 +93,10 @@ public int slot() {
         return code.classReader.readU2(offset + 8);
     }
 
-    public void writeTo(BufWriter b, CodeBuilder builder) {
-        int startBci = builder.labelToBci(startScope());
-        int endBci = builder.labelToBci(endScope());
+    public void writeTo(BufWriter b) {
+        var lc = ((BufWriterImpl)b).labelContext();
+        int startBci = lc.labelToBci(startScope());
+        int endBci = lc.labelToBci(endScope());
         int length = endBci - startBci;
         b.writeU2(startBci);
         b.writeU2(length);
diff --git a/src/java.base/share/classes/jdk/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/classfile/impl/AbstractInstruction.java
@@ -1487,9 +1487,10 @@ public Label endScope() {
             return endScope;
         }
 
-        public void writeTo(BufWriter b, CodeBuilder builder) {
-            int startBci = builder.labelToBci(startScope());
-            int endBci = builder.labelToBci(endScope());
+        public void writeTo(BufWriter b) {
+            var lc = ((BufWriterImpl)b).labelContext();
+            int startBci = lc.labelToBci(startScope());
+            int endBci = lc.labelToBci(endScope());
             int length = endBci - startBci;
             b.writeU2(startBci);
             b.writeU2(length);
diff --git a/src/java.base/share/classes/jdk/classfile/impl/BufWriterImpl.java b/src/java.base/share/classes/jdk/classfile/impl/BufWriterImpl.java
@@ -42,7 +42,7 @@
 public final class BufWriterImpl implements BufWriter {
 
     private final ConstantPoolBuilder constantPool;
-    private LabelResolver labelResolver;
+    private LabelContext labelContext;
     private ClassEntry thisClass;
     byte[] elems;
     int offset = 0;
@@ -61,12 +61,12 @@ public ConstantPoolBuilder constantPool() {
         return constantPool;
     }
 
-    public LabelResolver labelResolver() {
-        return labelResolver;
+    public LabelContext labelContext() {
+        return labelContext;
     }
 
-    public void setLabelResolver(LabelResolver labelResolver) {
-        this.labelResolver = labelResolver;
+    public void setLabelContext(LabelContext labelContext) {
+        this.labelContext = labelContext;
     }
     @Override
     public boolean canWriteDirect(ConstantPool other) {
diff --git a/src/java.base/share/classes/jdk/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/classfile/impl/BufferedCodeBuilder.java
@@ -196,11 +196,6 @@ public Optional<MethodModel> parent() {
             return Optional.empty();
         }
 
-        @Override
-        public int labelToBci(Label label) {
-            throw new UnsupportedOperationException("nyi");
-        }
-
         @Override
         public void writeTo(DirectMethodBuilder builder) {
             builder.withCode(new Consumer<>() {
diff --git a/src/java.base/share/classes/jdk/classfile/impl/ClassPrinterImpl.java b/src/java.base/share/classes/jdk/classfile/impl/ClassPrinterImpl.java
@@ -36,11 +36,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import jdk.classfile.Annotation;
@@ -50,8 +48,8 @@
 import jdk.classfile.AnnotationValue.*;
 import jdk.classfile.Attribute;
 import jdk.classfile.ClassModel;
-import jdk.classfile.CodeModel;
 import jdk.classfile.ClassPrinter.*;
+import jdk.classfile.CodeModel;
 import jdk.classfile.Instruction;
 import jdk.classfile.MethodModel;
 import jdk.classfile.TypeAnnotation;
@@ -512,7 +510,7 @@ private static Node elementValuePairsToTree(List<AnnotationElement> evps) {
                 new MapNodeImpl(FLOW, "value").with(elementValueToTree(evp.value())))));
     }
 
-    private static Stream<ConstantDesc> convertVTIs(LabelResolver lr, List<StackMapTableAttribute.VerificationTypeInfo> vtis) {
+    private static Stream<ConstantDesc> convertVTIs(CodeAttribute lr, List<StackMapTableAttribute.VerificationTypeInfo> vtis) {
         return vtis.stream().mapMulti((vti, ret) -> {
             switch (vti) {
                 case SimpleVerificationTypeInfo s -> {
@@ -549,7 +547,7 @@ public static MapNode modelToTree(CompoundElement<?> model, Verbosity verbosity)
             case ClassModel cm -> classToTree(cm, verbosity);
             case FieldModel fm -> fieldToTree(fm, verbosity);
             case MethodModel mm -> methodToTree(mm, verbosity);
-            case CodeModel com -> codeToTree((CodeImpl)com, verbosity);
+            case CodeModel com -> codeToTree((CodeAttribute)com, verbosity);
         };
     }
 
@@ -647,7 +645,7 @@ private static Node[] constantPoolToTree(ConstantPool cp, Verbosity verbosity) {
         }
     }
 
-    private static Node frameToTree(ConstantDesc name, LabelResolver lr, StackMapFrameInfo f) {
+    private static Node frameToTree(ConstantDesc name, CodeAttribute lr, StackMapFrameInfo f) {
         return new MapNodeImpl(FLOW, name).with(
                 list("locals", "item", convertVTIs(lr, f.locals())),
                 list("stack", "item", convertVTIs(lr, f.stack())));
@@ -669,14 +667,14 @@ public static MapNode methodToTree(MethodModel m, Verbosity verbosity) {
                       leaf("method type", m.methodType().stringValue()),
                       list("attributes", "attribute", m.attributes().stream().map(Attribute::attributeName)))
                 .with(attributesToTree(m.attributes(), verbosity))
-                .with(codeToTree((CodeImpl)m.code().orElse(null), verbosity));
+                .with(codeToTree((CodeAttribute)m.code().orElse(null), verbosity));
     }
 
-    private static MapNode codeToTree(CodeImpl com, Verbosity verbosity) {
+    private static MapNode codeToTree(CodeAttribute com, Verbosity verbosity) {
         if (verbosity != Verbosity.MEMBERS_ONLY && com != null) {
             var codeNode = new MapNodeImpl(BLOCK, "code");
-            codeNode.with(leaf("max stack", ((CodeAttribute)com).maxStack()));
-            codeNode.with(leaf("max locals", ((CodeAttribute)com).maxLocals()));
+            codeNode.with(leaf("max stack", com.maxStack()));
+            codeNode.with(leaf("max locals", com.maxLocals()));
             codeNode.with(list("attributes", "attribute", com.attributes().stream().map(Attribute::attributeName)));
             var stackMap = new MapNodeImpl(BLOCK, "stack map frames");
             var visibleTypeAnnos = new LinkedHashMap<Integer, List<TypeAnnotation>>();
@@ -994,7 +992,7 @@ private static Node[] localInfoToTree(List<LocalVariableInfo> locals, int slot,
         return new Node[0];
     }
 
-    private static void forEachOffset(TypeAnnotation ta, LabelResolver lr, BiConsumer<Integer, TypeAnnotation> consumer) {
+    private static void forEachOffset(TypeAnnotation ta, CodeAttribute lr, BiConsumer<Integer, TypeAnnotation> consumer) {
         switch (ta.targetInfo()) {
             case TypeAnnotation.OffsetTarget ot -> consumer.accept(lr.labelToBci(ot.target()), ta);
             case TypeAnnotation.TypeArgumentTarget tat -> consumer.accept(lr.labelToBci(tat.target()), ta);
diff --git a/src/java.base/share/classes/jdk/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/classfile/impl/DirectCodeBuilder.java
@@ -238,7 +238,7 @@ public void writeBody(BufWriter b) {
                         // @@@ Filter out LVs whose boundary labels are not defined?
                         b.writeU2(localVariables.size());
                         for (LocalVariable l : localVariables) {
-                            l.writeTo(b, DirectCodeBuilder.this);
+                            l.writeTo(b);
                         }
                         // @@@ If we're filtering, then also have to patch count
                     }
@@ -254,7 +254,7 @@ public void writeBody(BufWriter b) {
                         // @@@ Filter out LVs whose boundary labels are not defined?
                         b.writeU2(localVariableTypes.size());
                         for (LocalVariableType l : localVariableTypes) {
-                            l.writeTo(b, DirectCodeBuilder.this);
+                            l.writeTo(b);
                         }
                         // @@@ If we're filtering, then also have to patch count
                     }
@@ -272,6 +272,7 @@ public void writeBody(BufWriter b) {
             @Override
             public void writeBody(BufWriter b) {
                 BufWriterImpl buf = (BufWriterImpl) b;
+                buf.setLabelContext(DirectCodeBuilder.this);
 
                 int codeLength = curPc();
                 int maxStack, maxLocals;
@@ -304,14 +305,13 @@ else if (canReuseStackmaps) {
                 }
                 attributes.withAttribute(stackMapAttr);
 
-                buf.setLabelResolver(DirectCodeBuilder.this);
                 buf.writeU2(maxStack);
                 buf.writeU2(maxLocals);
                 buf.writeInt(codeLength);
                 buf.writeBytes(bytecodesBufWriter);
                 writeExceptionHandlers(b);
                 attributes.writeTo(b);
-                buf.setLabelResolver(null);
+                buf.setLabelContext(null);
             }
         };
     }
diff --git a/src/java.base/share/classes/jdk/classfile/impl/LabelContext.java b/src/java.base/share/classes/jdk/classfile/impl/LabelContext.java
@@ -29,9 +29,10 @@
 /**
  * LabelContext
  */
-public sealed interface LabelContext extends LabelResolver
+public sealed interface LabelContext
         permits BufferedCodeBuilder, CodeImpl, DirectCodeBuilder {
     Label newLabel();
     Label getLabel(int bci);
     void setLabelTarget(Label label, int bci);
+    int labelToBci(Label label);
 }
diff --git a/src/java.base/share/classes/jdk/classfile/impl/LabelResolver.java b/src/java.base/share/classes/jdk/classfile/impl/LabelResolver.java
diff --git a/src/java.base/share/classes/jdk/classfile/impl/NonterminalCodeBuilder.java b/src/java.base/share/classes/jdk/classfile/impl/NonterminalCodeBuilder.java
@@ -70,9 +70,4 @@ public Optional<CodeModel> original() {
     public Label newLabel() {
         return terminal.newLabel();
     }
-
-    @Override
-    public int labelToBci(Label label) {
-        return terminal.labelToBci(label);
-    }
 }
diff --git a/src/java.base/share/classes/jdk/classfile/impl/StackMapDecoder.java b/src/java.base/share/classes/jdk/classfile/impl/StackMapDecoder.java
@@ -95,7 +95,7 @@ public static List<VerificationTypeInfo> initFrameLocals(ClassEntry thisClass, S
 
     public static void writeFrames(BufWriter b, List<StackMapFrameInfo> entries) {
         var buf = (BufWriterImpl)b;
-        var dcb = (DirectCodeBuilder)buf.labelResolver();
+        var dcb = (DirectCodeBuilder)buf.labelContext();
         var mi = dcb.methodInfo();
         var prevLocals = StackMapDecoder.initFrameLocals(buf.thisClass(),
                 mi.methodName().stringValue(),
@@ -166,7 +166,7 @@ private static void writeTypeInfo(BufWriterImpl bw, VerificationTypeInfo vti) {
             case ObjectVerificationTypeInfo ovti ->
                 bw.writeIndex(ovti.className());
             case UninitializedVerificationTypeInfo uvti ->
-                bw.writeU2(bw.labelResolver().labelToBci(uvti.newTarget()));
+                bw.writeU2(bw.labelContext().labelToBci(uvti.newTarget()));
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/classfile/impl/UnboundAttribute.java b/src/java.base/share/classes/jdk/classfile/impl/UnboundAttribute.java
@@ -811,15 +811,15 @@ public UnboundTypeAnnotation(TargetInfo targetInfo, List<TypePathComponent> targ
             this.elements = List.copyOf(elements);
         }
 
-        private int labelToBci(LabelResolver lr, Label label) {
+        private int labelToBci(LabelContext lr, Label label) {
             //helper method to avoid NPE
             if (lr == null) throw new IllegalArgumentException("Illegal targetType '%s' in TypeAnnotation outside of Code attribute".formatted(targetInfo.targetType()));
             return lr.labelToBci(label);
         }
 
         @Override
         public void writeTo(BufWriter buf) {
-            LabelResolver lr = ((BufWriterImpl) buf).labelResolver();
+            LabelContext lr = ((BufWriterImpl) buf).labelContext();
             // target_type
             buf.writeU1(targetInfo.targetType().targetTypeValue());
 
diff --git a/src/java.base/share/classes/jdk/classfile/instruction/LocalVariable.java b/src/java.base/share/classes/jdk/classfile/instruction/LocalVariable.java
@@ -80,5 +80,5 @@ default ClassDesc typeSymbol() {
      */
     Label endScope();
 
-    void writeTo(BufWriter buf, CodeBuilder labelContext);
+    void writeTo(BufWriter buf);
 }
diff --git a/src/java.base/share/classes/jdk/classfile/instruction/LocalVariableType.java b/src/java.base/share/classes/jdk/classfile/instruction/LocalVariableType.java
@@ -77,5 +77,5 @@ default Signature signatureSymbol() {
      */
     Label endScope();
 
-    void writeTo(BufWriter buf, CodeBuilder labelContext);
+    void writeTo(BufWriter buf);
 }
diff --git a/test/jdk/jdk/classfile/helpers/ClassRecord.java b/test/jdk/jdk/classfile/helpers/ClassRecord.java
diff --git a/test/jdk/jdk/classfile/helpers/CorpusTestHelper.java b/test/jdk/jdk/classfile/helpers/CorpusTestHelper.java

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,6 @@ public sealed interface CodeBuilder`
`119`	`119`	`* the current block will be the entire method body. */`
`120`	`120`	`Label endLabel();`
`121`	`121`
`122`		`- /** {@return the bytecode offset associated with the specified label} */`
`123`		`- int labelToBci(Label label);`
`124`		`-`
`125`	`122`	`/**`
`126`	`123`	`* {@return the local variable slot associated with the receiver}.`
`127`	`124`	`*`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public void writeBody(BufWriter b) {`
`238`	`238`	`// @@@ Filter out LVs whose boundary labels are not defined?`
`239`	`239`	`b.writeU2(localVariables.size());`
`240`	`240`	`for (LocalVariable l : localVariables) {`
`241`		`- l.writeTo(b, DirectCodeBuilder.this);`
	`241`	`+ l.writeTo(b);`
`242`	`242`	`}`
`243`	`243`	`// @@@ If we're filtering, then also have to patch count`
`244`	`244`	`}`
`@@ -254,7 +254,7 @@ public void writeBody(BufWriter b) {`
`254`	`254`	`// @@@ Filter out LVs whose boundary labels are not defined?`
`255`	`255`	`b.writeU2(localVariableTypes.size());`
`256`	`256`	`for (LocalVariableType l : localVariableTypes) {`
`257`		`- l.writeTo(b, DirectCodeBuilder.this);`
	`257`	`+ l.writeTo(b);`
`258`	`258`	`}`
`259`	`259`	`// @@@ If we're filtering, then also have to patch count`
`260`	`260`	`}`
`@@ -272,6 +272,7 @@ public void writeBody(BufWriter b) {`
`272`	`272`	`@Override`
`273`	`273`	`public void writeBody(BufWriter b) {`
`274`	`274`	`BufWriterImpl buf = (BufWriterImpl) b;`
	`275`	`+ buf.setLabelContext(DirectCodeBuilder.this);`
`275`	`276`
`276`	`277`	`int codeLength = curPc();`
`277`	`278`	`int maxStack, maxLocals;`
`@@ -304,14 +305,13 @@ else if (canReuseStackmaps) {`
`304`	`305`	`}`
`305`	`306`	`attributes.withAttribute(stackMapAttr);`
`306`	`307`
`307`		`- buf.setLabelResolver(DirectCodeBuilder.this);`
`308`	`308`	`buf.writeU2(maxStack);`
`309`	`309`	`buf.writeU2(maxLocals);`
`310`	`310`	`buf.writeInt(codeLength);`
`311`	`311`	`buf.writeBytes(bytecodesBufWriter);`
`312`	`312`	`writeExceptionHandlers(b);`
`313`	`313`	`attributes.writeTo(b);`
`314`		`- buf.setLabelResolver(null);`
	`314`	`+ buf.setLabelContext(null);`
`315`	`315`	`}`
`316`	`316`	`};`
`317`	`317`	`}`