src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java

*** 44,58 ****
  import jdk.vm.ci.meta.ExceptionHandler;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaMethod;
  import jdk.vm.ci.meta.JavaType;
  import jdk.vm.ci.meta.LineNumberTable;
- import jdk.vm.ci.meta.LineNumberTableImpl;
  import jdk.vm.ci.meta.Local;
- import jdk.vm.ci.meta.LocalImpl;
  import jdk.vm.ci.meta.LocalVariableTable;
- import jdk.vm.ci.meta.LocalVariableTableImpl;
  import jdk.vm.ci.meta.ModifiersProvider;
  import jdk.vm.ci.meta.ProfilingInfo;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaType;
  import jdk.vm.ci.meta.Signature;
--- 44,55 ----
*** 60,70 ****
  import jdk.vm.ci.meta.TriState;
  
  /**
   * Implementation of {@link JavaMethod} for resolved HotSpot methods.
   */
! final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, HotSpotProxified, MetaspaceWrapperObject {
  
      /**
       * Reference to metaspace Method object.
       */
      private final long metaspaceMethod;
--- 57,67 ----
  import jdk.vm.ci.meta.TriState;
  
  /**
   * Implementation of {@link JavaMethod} for resolved HotSpot methods.
   */
! final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, MetaspaceWrapperObject {
  
      /**
       * Reference to metaspace Method object.
       */
      private final long metaspaceMethod;
*** 569,579 ****
          for (int i = 0; i < values.length / 2; i++) {
              bci[i] = (int) values[i * 2];
              line[i] = (int) values[i * 2 + 1];
          }
  
!         return new LineNumberTableImpl(line, bci);
      }
  
      @Override
      public LocalVariableTable getLocalVariableTable() {
          final boolean hasLocalVariableTable = (getConstMethodFlags() & config().constMethodHasLocalVariableTable) != 0;
--- 566,576 ----
          for (int i = 0; i < values.length / 2; i++) {
              bci[i] = (int) values[i * 2];
              line[i] = (int) values[i * 2 + 1];
          }
  
!         return new LineNumberTable(line, bci);
      }
  
      @Override
      public LocalVariableTable getLocalVariableTable() {
          final boolean hasLocalVariableTable = (getConstMethodFlags() & config().constMethodHasLocalVariableTable) != 0;
*** 594,610 ****
              final int slot = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementSlotOffset);
  
              String localName = getConstantPool().lookupUtf8(nameCpIndex);
              String localType = getConstantPool().lookupUtf8(typeCpIndex);
  
!             locals[i] = new LocalImpl(localName, runtime().lookupType(localType, holder, false), startBci, endBci, slot);
  
              // Go to the next LocalVariableTableElement
              localVariableTableElement += config.localVariableTableElementSize;
          }
  
!         return new LocalVariableTableImpl(locals);
      }
  
      /**
       * Returns the offset of this method into the v-table. The method must have a v-table entry as
       * indicated by {@link #isInVirtualMethodTable(ResolvedJavaType)}, otherwise an exception is
--- 591,607 ----
              final int slot = UNSAFE.getChar(localVariableTableElement + config.localVariableTableElementSlotOffset);
  
              String localName = getConstantPool().lookupUtf8(nameCpIndex);
              String localType = getConstantPool().lookupUtf8(typeCpIndex);
  
!             locals[i] = new Local(localName, runtime().lookupType(localType, holder, false), startBci, endBci, slot);
  
              // Go to the next LocalVariableTableElement
              localVariableTableElement += config.localVariableTableElementSize;
          }
  
!         return new LocalVariableTable(locals);
      }
  
      /**
       * Returns the offset of this method into the v-table. The method must have a v-table entry as
       * indicated by {@link #isInVirtualMethodTable(ResolvedJavaType)}, otherwise an exception is