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

*** 22,31 ****
--- 22,32 ----
   */
  
  
  package org.graalvm.compiler.hotspot.meta;
  
+ import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
  import static org.graalvm.compiler.core.common.GraalOptions.AlwaysInlineVTableStubs;
  import static org.graalvm.compiler.core.common.GraalOptions.InlineVTableStubs;
  import static org.graalvm.compiler.core.common.GraalOptions.OmitHotExceptionStacktrace;
  import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.OSR_MIGRATION_END;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_KLASS_LOCATION;
*** 56,76 ****
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeInputList;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode;
- import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
- import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePreWriteBarrier;
- import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
- import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
- import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
  import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
  import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode;
  import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode;
- import org.graalvm.compiler.hotspot.nodes.SerialArrayRangeWriteBarrier;
- import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
  import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
--- 57,77 ----
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeInputList;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
+ import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePostWriteBarrier;
+ import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePreWriteBarrier;
+ import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+ import org.graalvm.compiler.hotspot.gc.g1.G1PreWriteBarrier;
+ import org.graalvm.compiler.hotspot.gc.g1.G1ReferentFieldReadBarrier;
+ import org.graalvm.compiler.hotspot.gc.shared.SerialArrayRangeWriteBarrier;
+ import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
  import org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode;
  import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
  import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode;
  import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode;
  import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
  import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
  import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
*** 160,169 ****
--- 161,171 ----
  import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider;
  import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
  import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
  import org.graalvm.compiler.replacements.arraycopy.ArrayCopyWithSlowPathNode;
  import org.graalvm.compiler.replacements.nodes.AssertionNode;
+ import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  
  import jdk.vm.ci.code.TargetDescription;
  import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
  import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
*** 223,233 ****
          assertionSnippets = new AssertionSnippets.Templates(options, factories, providers, target);
          arraycopySnippets = new ArrayCopySnippets.Templates(new HotSpotArraycopySnippets(), options, factories, runtime, providers, providers.getSnippetReflection(), target);
          stringToBytesSnippets = new StringToBytesSnippets.Templates(options, factories, providers, target);
          hashCodeSnippets = new HashCodeSnippets.Templates(options, factories, providers, target);
          resolveConstantSnippets = new ResolveConstantSnippets.Templates(options, factories, providers, target);
!         profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
          objectCloneSnippets = new ObjectCloneSnippets.Templates(options, factories, providers, target);
          foreignCallSnippets = new ForeignCallSnippets.Templates(options, factories, providers, target);
      }
  
      public MonitorSnippets.Templates getMonitorSnippets() {
--- 225,237 ----
          assertionSnippets = new AssertionSnippets.Templates(options, factories, providers, target);
          arraycopySnippets = new ArrayCopySnippets.Templates(new HotSpotArraycopySnippets(), options, factories, runtime, providers, providers.getSnippetReflection(), target);
          stringToBytesSnippets = new StringToBytesSnippets.Templates(options, factories, providers, target);
          hashCodeSnippets = new HashCodeSnippets.Templates(options, factories, providers, target);
          resolveConstantSnippets = new ResolveConstantSnippets.Templates(options, factories, providers, target);
!         if (!JavaVersionUtil.Java8OrEarlier) {
!             profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
!         }
          objectCloneSnippets = new ObjectCloneSnippets.Templates(options, factories, providers, target);
          foreignCallSnippets = new ForeignCallSnippets.Templates(options, factories, providers, target);
      }
  
      public MonitorSnippets.Templates getMonitorSnippets() {
*** 681,690 ****
--- 685,697 ----
              runtimeCalls.put(BytecodeExceptionKind.LONG_EXACT_OVERFLOW, new ForeignCallDescriptor("createLongExactOverflowException", ArithmeticException.class));
          }
      }
  
      private void throwCachedException(BytecodeExceptionNode node) {
+         if (IS_IN_NATIVE_IMAGE) {
+             throw new InternalError("Can't throw exception from SVM object");
+         }
          Throwable exception = Exceptions.cachedExceptions.get(node.getExceptionKind());
          assert exception != null;
  
          StructuredGraph graph = node.graph();
          FloatingNode exceptionNode = ConstantNode.forConstant(constantReflection.forObject(exception), metaAccess, graph);