src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java

*** 1,7 ****
  /*
!  * 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2018, 2019, 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.
*** 208,218 ****
          protected int immediateSize() {
              throw new UnsupportedOperationException();
          }
      }
  
!     public abstract static class OperandDataAnnotation extends CodeAnnotation {
          /**
           * The position (bytes from the beginning of the method) of the operand.
           */
          public final int operandPosition;
          /**
--- 208,218 ----
          protected int immediateSize() {
              throw new UnsupportedOperationException();
          }
      }
  
!     public static class OperandDataAnnotation extends CodeAnnotation {
          /**
           * The position (bytes from the beginning of the method) of the operand.
           */
          public final int operandPosition;
          /**
*** 237,270 ****
          public String toString() {
              return getClass().getSimpleName() + " instruction [" + instructionPosition + ", " + nextInstructionPosition + "[ operand at " + operandPosition + " size " + operandSize;
          }
      }
  
-     /**
-      * Annotation that stores additional information about the displacement of a
-      * {@link Assembler#getPlaceholder placeholder address} that needs patching.
-      */
-     protected static class AddressDisplacementAnnotation extends OperandDataAnnotation {
-         AddressDisplacementAnnotation(int instructionPosition, int operandPosition, int operandSize, int nextInstructionPosition) {
-             super(instructionPosition, operandPosition, operandSize, nextInstructionPosition);
-         }
-     }
- 
-     /**
-      * Annotation that stores additional information about the immediate operand, e.g., of a call
-      * instruction, that needs patching.
-      */
-     protected static class ImmediateOperandAnnotation extends OperandDataAnnotation {
-         ImmediateOperandAnnotation(int instructionPosition, int operandPosition, int operandSize, int nextInstructionPosition) {
-             super(instructionPosition, operandPosition, operandSize, nextInstructionPosition);
-         }
-     }
- 
      protected void annotatePatchingImmediate(int operandOffset, int operandSize) {
          if (codePatchingAnnotationConsumer != null) {
              int pos = position();
!             codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(pos, pos + operandOffset, operandSize, pos + operandOffset + operandSize));
          }
      }
  
      public final boolean supports(CPUFeature feature) {
          return ((AMD64) target.arch).getFeatures().contains(feature);
--- 237,250 ----
          public String toString() {
              return getClass().getSimpleName() + " instruction [" + instructionPosition + ", " + nextInstructionPosition + "[ operand at " + operandPosition + " size " + operandSize;
          }
      }
  
      protected void annotatePatchingImmediate(int operandOffset, int operandSize) {
          if (codePatchingAnnotationConsumer != null) {
              int pos = position();
!             codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(pos, pos + operandOffset, operandSize, pos + operandOffset + operandSize));
          }
      }
  
      public final boolean supports(CPUFeature feature) {
          return ((AMD64) target.arch).getFeatures().contains(feature);
*** 579,589 ****
          if (base.equals(AMD64.rip)) { // also matches addresses returned by getPlaceholder()
              // [00 000 101] disp32
              assert index.equals(Register.None) : "cannot use RIP relative addressing with index register";
              emitByte(0x05 | regenc);
              if (codePatchingAnnotationConsumer != null && addr.instructionStartPosition >= 0) {
!                 codePatchingAnnotationConsumer.accept(new AddressDisplacementAnnotation(addr.instructionStartPosition, position(), 4, position() + 4 + additionalInstructionSize));
              }
              emitInt(disp);
          } else if (base.isValid()) {
              boolean overriddenForce4Byte = force4Byte;
              int baseenc = base.isValid() ? encode(base) : 0;
--- 559,569 ----
          if (base.equals(AMD64.rip)) { // also matches addresses returned by getPlaceholder()
              // [00 000 101] disp32
              assert index.equals(Register.None) : "cannot use RIP relative addressing with index register";
              emitByte(0x05 | regenc);
              if (codePatchingAnnotationConsumer != null && addr.instructionStartPosition >= 0) {
!                 codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(addr.instructionStartPosition, position(), 4, position() + 4 + additionalInstructionSize));
              }
              emitInt(disp);
          } else if (base.isValid()) {
              boolean overriddenForce4Byte = force4Byte;
              int baseenc = base.isValid() ? encode(base) : 0;