Compile errors; now tests are all green.

liachmodded · Aug 29, 2024 · 254c6d2 · 254c6d2
1 parent 96c0207
commit 254c6d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
@@ -484,9 +484,11 @@ private void processDeferredLabels() {
     // Instruction writing
 
     public void writeBytecode(Opcode opcode) {
-        if (opcode.isWide())
-            bytecodesBufWriter.writeU1(ClassFile.WIDE);
-        bytecodesBufWriter.writeU1(opcode.bytecode() & 0xFF);
+        if (opcode.isWide()) {
+            bytecodesBufWriter.writeU2(opcode.bytecode());
+        } else {
+            bytecodesBufWriter.writeU1(opcode.bytecode());
+        }
     }
 
     public void writeLocalVar(Opcode opcode, int localVar) {

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/RawBytecodeHelper.java b/src/java.base/share/classes/jdk/internal/classfile/impl/RawBytecodeHelper.java
@@ -25,11 +25,7 @@
 package jdk.internal.classfile.impl;
 
 import java.nio.ByteBuffer;
-import static java.lang.classfile.ClassFile.ASTORE_3;
-import static java.lang.classfile.ClassFile.ISTORE;
-import static java.lang.classfile.ClassFile.LOOKUPSWITCH;
-import static java.lang.classfile.ClassFile.TABLESWITCH;
-import static java.lang.classfile.ClassFile.WIDE;
+import static java.lang.classfile.Opcode.OpcodeValues.*;
 
 public final class RawBytecodeHelper {