src/java.base/share/classes/jdk/internal/org/objectweb/asm/Constants.java

@@ -182,14 +182,12 @@
  
      // Constants to convert JVM opcodes to the equivalent ASM specific opcodes, and vice versa.
  
      // The delta between the ASM_IFEQ, ..., ASM_IF_ACMPNE, ASM_GOTO and ASM_JSR opcodes
      // and IFEQ, ..., IF_ACMPNE, GOTO and JSR.
-     static final int ASM_OPCODE_DELTA = 49;
- 
-     // The delta between the ASM_IFNULL and ASM_IFNONNULL opcodes and IFNULL and IFNONNULL.
-     static final int ASM_IFNULL_OPCODE_DELTA = 20;
+     // Offset to next available opcode after WITHFIELD from IFEQ
+     static final int ASM_OPCODE_DELTA = (Opcodes.WITHFIELD + 1) - Opcodes.IFEQ;
  
      // ASM specific opcodes, used for long forward jump instructions.
  
      static final int ASM_IFEQ = Opcodes.IFEQ + ASM_OPCODE_DELTA;
      static final int ASM_IFNE = Opcodes.IFNE + ASM_OPCODE_DELTA;

@@ -205,13 +203,18 @@
      static final int ASM_IF_ICMPLE = Opcodes.IF_ICMPLE + ASM_OPCODE_DELTA;
      static final int ASM_IF_ACMPEQ = Opcodes.IF_ACMPEQ + ASM_OPCODE_DELTA;
      static final int ASM_IF_ACMPNE = Opcodes.IF_ACMPNE + ASM_OPCODE_DELTA;
      static final int ASM_GOTO = Opcodes.GOTO + ASM_OPCODE_DELTA;
      static final int ASM_JSR = Opcodes.JSR + ASM_OPCODE_DELTA;
+ 
+     // The delta between the ASM_IFNULL and ASM_IFNONNULL opcodes and IFNULL and IFNONNULL.
+     // Offset to next available opcode after ASM_JSR from IFNULL.
+     static final int ASM_IFNULL_OPCODE_DELTA = (ASM_JSR + 1) - Opcodes.IFNULL;
+ 
      static final int ASM_IFNULL = Opcodes.IFNULL + ASM_IFNULL_OPCODE_DELTA;
      static final int ASM_IFNONNULL = Opcodes.IFNONNULL + ASM_IFNULL_OPCODE_DELTA;
-     static final int ASM_GOTO_W = 220;
+     static final int ASM_GOTO_W = GOTO_W + ASM_IFNULL_OPCODE_DELTA;
  
      private Constants() {}
  
      static void checkAsmExperimental(final Object caller) {
          Class<?> callerClass = caller.getClass();