src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java

*** 20,36 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.meta;
  
- import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
- import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.SAFEPOINT;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee;
  
! import java.util.HashMap;
! import java.util.Map;
  
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.LocationIdentity;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.meta;
  
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee;
+ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
+ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.SAFEPOINT;
  
! import java.util.ArrayList;
! import java.util.List;
  
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.LocationIdentity;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
*** 38,49 ****
--- 38,51 ----
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.stubs.ForeignCallStub;
  import org.graalvm.compiler.hotspot.stubs.Stub;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.word.Word;
  import org.graalvm.compiler.word.WordTypes;
+ import org.graalvm.util.EconomicMap;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.code.CodeCacheProvider;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
  import jdk.vm.ci.meta.JavaKind;
*** 62,72 ****
      public static final ForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new ForeignCallDescriptor("test_deoptimize_call_int", int.class, int.class);
  
      protected final HotSpotJVMCIRuntimeProvider jvmciRuntime;
      protected final HotSpotGraalRuntimeProvider runtime;
  
!     protected final Map<ForeignCallDescriptor, HotSpotForeignCallLinkage> foreignCalls = new HashMap<>();
      protected final MetaAccessProvider metaAccess;
      protected final CodeCacheProvider codeCache;
      protected final WordTypes wordTypes;
  
      public HotSpotForeignCallsProviderImpl(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache,
--- 64,74 ----
      public static final ForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new ForeignCallDescriptor("test_deoptimize_call_int", int.class, int.class);
  
      protected final HotSpotJVMCIRuntimeProvider jvmciRuntime;
      protected final HotSpotGraalRuntimeProvider runtime;
  
!     protected final EconomicMap<ForeignCallDescriptor, HotSpotForeignCallLinkage> foreignCalls = EconomicMap.create();
      protected final MetaAccessProvider metaAccess;
      protected final CodeCacheProvider codeCache;
      protected final WordTypes wordTypes;
  
      public HotSpotForeignCallsProviderImpl(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache,
*** 142,154 ****
       * @param reexecutable specifies if the foreign call can be re-executed without (meaningful)
       *            side effects. Deoptimization will not return to a point before a foreign call that
       *            cannot be re-executed.
       * @param killedLocations the memory locations killed by the foreign call
       */
!     public void linkForeignCall(HotSpotProviders providers, ForeignCallDescriptor descriptor, long address, boolean prependThread, Transition transition, boolean reexecutable,
!                     LocationIdentity... killedLocations) {
!         ForeignCallStub stub = new ForeignCallStub(jvmciRuntime, providers, address, descriptor, prependThread, transition, reexecutable, killedLocations);
          HotSpotForeignCallLinkage linkage = stub.getLinkage();
          HotSpotForeignCallLinkage targetLinkage = stub.getTargetLinkage();
          linkage.setCompiledStub(stub);
          register(linkage);
          register(targetLinkage);
--- 144,156 ----
       * @param reexecutable specifies if the foreign call can be re-executed without (meaningful)
       *            side effects. Deoptimization will not return to a point before a foreign call that
       *            cannot be re-executed.
       * @param killedLocations the memory locations killed by the foreign call
       */
!     public void linkForeignCall(OptionValues options, HotSpotProviders providers, ForeignCallDescriptor descriptor, long address, boolean prependThread, Transition transition,
!                     boolean reexecutable, LocationIdentity... killedLocations) {
!         ForeignCallStub stub = new ForeignCallStub(options, jvmciRuntime, providers, address, descriptor, prependThread, transition, reexecutable, killedLocations);
          HotSpotForeignCallLinkage linkage = stub.getLinkage();
          HotSpotForeignCallLinkage targetLinkage = stub.getTargetLinkage();
          linkage.setCompiledStub(stub);
          register(linkage);
          register(targetLinkage);
*** 196,201 ****
--- 198,216 ----
  
      @Override
      public LIRKind getValueKind(JavaKind javaKind) {
          return LIRKind.fromJavaKind(codeCache.getTarget().arch, javaKind);
      }
+ 
+     @Override
+     public List<Stub> getStubs() {
+         List<Stub> stubs = new ArrayList<>();
+         for (HotSpotForeignCallLinkage linkage : foreignCalls.getValues()) {
+             if (linkage.isCompiledStub()) {
+                 Stub stub = linkage.getStub();
+                 assert stub != null;
+                 stubs.add(stub);
+             }
+         }
+         return stubs;
+     }
  }