optimize imports

lewurm · lewurm · commit ae58618c1d20 · 2024-10-23T10:46:00.000+02:00
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -38,7 +38,6 @@
 
 import java.util.function.BiConsumer;
 
-import com.oracle.svm.core.pltgot.PLTGOTConfiguration;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.FrameAccess;
@@ -73,6 +72,7 @@
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.nodes.SafepointCheckNode;
+import com.oracle.svm.core.pltgot.PLTGOTConfiguration;
 import com.oracle.svm.core.thread.VMThreads.StatusSupport;
 import com.oracle.svm.core.util.VMError;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -46,7 +46,6 @@
 import java.util.EnumSet;
 import java.util.function.BiConsumer;
 
-import com.oracle.svm.core.pltgot.PLTGOTConfiguration;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.ImageSingletons;
 
@@ -94,6 +93,7 @@
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.nodes.SafepointCheckNode;
+import com.oracle.svm.core.pltgot.PLTGOTConfiguration;
 import com.oracle.svm.core.thread.VMThreads.StatusSupport;
 import com.oracle.svm.core.util.VMError;
 
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinGOTHeapSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinGOTHeapSupport.java
@@ -44,8 +44,8 @@
 import com.oracle.svm.core.headers.LibC;
 import com.oracle.svm.core.os.VirtualMemoryProvider;
 import com.oracle.svm.core.os.VirtualMemoryProvider.Access;
-import com.oracle.svm.core.posix.headers.darwin.DarwinVirtualMemory;
 import com.oracle.svm.core.pltgot.GOTHeapSupport;
+import com.oracle.svm.core.posix.headers.darwin.DarwinVirtualMemory;
 
 public class DarwinGOTHeapSupport extends GOTHeapSupport {
 
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxGOTHeapSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxGOTHeapSupport.java
@@ -48,11 +48,11 @@
 import com.oracle.svm.core.headers.LibC;
 import com.oracle.svm.core.os.VirtualMemoryProvider;
 import com.oracle.svm.core.os.VirtualMemoryProvider.Access;
+import com.oracle.svm.core.pltgot.GOTHeapSupport;
 import com.oracle.svm.core.posix.headers.Errno;
 import com.oracle.svm.core.posix.headers.Fcntl;
 import com.oracle.svm.core.posix.headers.Unistd;
 import com.oracle.svm.core.thread.VMThreads;
-import com.oracle.svm.core.pltgot.GOTHeapSupport;
 
 public class LinuxGOTHeapSupport extends GOTHeapSupport {
 
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxPLTGOTFeature.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxPLTGOTFeature.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.posix.linux;
 
-import com.oracle.svm.hosted.pltgot.PLTGOTOptions;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.code.DynamicMethodAddressResolutionHeapSupport;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.hosted.pltgot.PLTGOTOptions;
 
 @AutomaticallyRegisteredFeature
 public class LinuxPLTGOTFeature implements InternalFeature {
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsGOTHeapSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsGOTHeapSupport.java
@@ -36,11 +36,11 @@
 import com.oracle.svm.core.headers.LibC;
 import com.oracle.svm.core.os.VirtualMemoryProvider;
 import com.oracle.svm.core.os.VirtualMemoryProvider.Access;
+import com.oracle.svm.core.pltgot.GOTHeapSupport;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.windows.headers.MemoryAPI;
 import com.oracle.svm.core.windows.headers.WinBase;
 import com.oracle.svm.core.windows.headers.WinBase.HANDLE;
-import com.oracle.svm.core.pltgot.GOTHeapSupport;
 
 public class WindowsGOTHeapSupport extends GOTHeapSupport {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/ExitMethodAddressResolutionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/ExitMethodAddressResolutionNode.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.pltgot;
 
+import org.graalvm.nativeimage.c.function.CodePointer;
+
 import com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 
 import jdk.graal.compiler.core.common.type.StampFactory;
@@ -36,7 +38,6 @@
 import jdk.graal.compiler.nodes.ValueNode;
 import jdk.graal.compiler.nodes.spi.LIRLowerable;
 import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.nativeimage.c.function.CodePointer;
 
 @NodeInfo(cycles = NodeCycles.CYCLES_1, size = NodeSize.SIZE_1)
 public final class ExitMethodAddressResolutionNode extends ControlSinkNode implements LIRLowerable {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/GOTAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/GOTAccess.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.pltgot;
 
-import jdk.graal.compiler.word.Word;
-
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.config.ConfigurationValues;
 
+import jdk.graal.compiler.word.Word;
+
 public class GOTAccess {
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/PLTGOTConfiguration.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/PLTGOTConfiguration.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.pltgot;
 
-import jdk.vm.ci.code.RegisterConfig;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.lir.LIRInstruction;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.RegisterValue;
 
 public abstract class PLTGOTConfiguration {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/aarch64/AArch64MethodAddressResolutionDispatcher.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/aarch64/AArch64MethodAddressResolutionDispatcher.java
@@ -26,15 +26,15 @@
 
 import static com.oracle.svm.core.pltgot.ExitMethodAddressResolutionNode.exitMethodAddressResolution;
 
-import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.deopt.DeoptimizationSlotPacking;
 import com.oracle.svm.core.graal.code.StubCallingConvention;
-import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.pltgot.MethodAddressResolutionDispatcher;
+import com.oracle.svm.core.snippets.KnownIntrinsics;
 
 import jdk.graal.compiler.nodes.UnreachableNode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/amd64/AMD64MethodAddressResolutionDispatcher.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/pltgot/amd64/AMD64MethodAddressResolutionDispatcher.java
@@ -26,9 +26,9 @@
 
 import static com.oracle.svm.core.pltgot.ExitMethodAddressResolutionNode.exitMethodAddressResolution;
 
-import com.oracle.svm.core.NeverInline;
 import org.graalvm.word.WordFactory;
 
+import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.graal.code.ExplicitCallingConvention;
 import com.oracle.svm.core.graal.code.StubCallingConvention;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/PLTGOTNonSnippetLowerings.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/PLTGOTNonSnippetLowerings.java
@@ -26,7 +26,6 @@
 
 import java.util.Map;
 
-import com.oracle.svm.hosted.pltgot.HostedPLTGOTConfiguration;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.LocationIdentity;
@@ -40,9 +39,10 @@
 import com.oracle.svm.core.graal.snippets.NonSnippetLowerings;
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.pltgot.GOTAccess;
+import com.oracle.svm.hosted.nodes.ReadReservedRegister;
 import com.oracle.svm.hosted.pltgot.GOTEntryAllocator;
+import com.oracle.svm.hosted.pltgot.HostedPLTGOTConfiguration;
 import com.oracle.svm.hosted.pltgot.MethodAddressResolutionSupport;
-import com.oracle.svm.hosted.nodes.ReadReservedRegister;
 
 import jdk.graal.compiler.core.common.memory.BarrierType;
 import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/aarch64/PLTGOTAArch64Lowerings.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/aarch64/PLTGOTAArch64Lowerings.java
@@ -28,9 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.graal.compiler.graph.Node;
-import jdk.graal.compiler.options.OptionValues;
-import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -43,6 +40,10 @@
 import com.oracle.svm.graal.pltgot.PLTGOTNonSnippetLowerings;
 import com.oracle.svm.hosted.pltgot.PLTGOTOptions;
 
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+
 @AutomaticallyRegisteredFeature
 @Platforms(Platform.AARCH64.class)
 public class PLTGOTAArch64Lowerings implements InternalFeature {
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/amd64/PLTGOTAMD64Lowerings.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/pltgot/amd64/PLTGOTAMD64Lowerings.java
@@ -24,23 +24,25 @@
  */
 package com.oracle.svm.graal.pltgot.amd64;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.hosted.Feature;
+
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
 import com.oracle.svm.core.graal.snippets.amd64.AMD64SnippetsFeature;
-import com.oracle.svm.hosted.pltgot.PLTGOTOptions;
 import com.oracle.svm.graal.pltgot.PLTGOTNonSnippetLowerings;
+import com.oracle.svm.hosted.pltgot.PLTGOTOptions;
+
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.util.Providers;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.hosted.Feature;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 @AutomaticallyRegisteredFeature
 @Platforms(Platform.AMD64.class)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
@@ -45,7 +45,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.oracle.svm.core.graal.code.SubstrateBackend;
 import org.graalvm.collections.Pair;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -70,6 +69,7 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.hub.ClassForNameSupport;
 import com.oracle.svm.core.meta.SharedField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/GOTEntryAllocator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/GOTEntryAllocator.java
@@ -29,12 +29,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.meta.HostedMethod;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
-import com.oracle.svm.core.meta.SharedMethod;
 
 public class GOTEntryAllocator {
     public static final int GOT_NO_ENTRY = -2;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/HostedPLTGOTConfiguration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/HostedPLTGOTConfiguration.java
@@ -26,7 +26,6 @@
 
 import java.lang.reflect.Method;
 
-import jdk.vm.ci.code.RegisterConfig;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.objectfile.SectionName;
@@ -35,6 +34,7 @@
 import com.oracle.svm.hosted.meta.HostedMethod;
 
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterConfig;
 
 public abstract class HostedPLTGOTConfiguration extends PLTGOTConfiguration {
     public static final SectionName SVM_GOT_SECTION = new SectionName.ProgbitsSectionName("svm_got");
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/IdentityMethodAddressResolverFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/IdentityMethodAddressResolverFeature.java
@@ -45,9 +45,9 @@
 import com.oracle.svm.core.jdk.InternalVMMethod;
 import com.oracle.svm.core.meta.MethodPointer;
 import com.oracle.svm.core.meta.SharedMethod;
-import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
 import com.oracle.svm.core.pltgot.IdentityMethodAddressResolver;
 import com.oracle.svm.core.pltgot.MethodAddressResolver;
+import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.image.NativeImage;
 import com.oracle.svm.hosted.image.RelocatableBuffer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/MethodAddressResolutionSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/MethodAddressResolutionSupport.java
@@ -24,12 +24,9 @@
  */
 package com.oracle.svm.hosted.pltgot;
 
-import com.oracle.svm.core.pltgot.MethodAddressResolver;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.svm.core.meta.SharedMethod;
+import com.oracle.svm.core.pltgot.MethodAddressResolver;
 
 /**
  * Provides necessary services for dynamic method address resolution through the PLT/GOT.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTGOTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTGOTFeature.java
@@ -42,15 +42,15 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.RuntimeCompilation;
 import com.oracle.svm.core.meta.SharedMethod;
-import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.core.pltgot.GOTAccess;
 import com.oracle.svm.core.pltgot.GOTHeapSupport;
 import com.oracle.svm.core.pltgot.PLTGOTConfiguration;
-import com.oracle.svm.hosted.pltgot.aarch64.AArch64HostedPLTGOTConfiguration;
-import com.oracle.svm.hosted.pltgot.amd64.AMD64HostedPLTGOTConfiguration;
+import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.image.MethodPointerRelocationProvider;
 import com.oracle.svm.hosted.image.RelocatableBuffer;
+import com.oracle.svm.hosted.pltgot.aarch64.AArch64HostedPLTGOTConfiguration;
+import com.oracle.svm.hosted.pltgot.amd64.AMD64HostedPLTGOTConfiguration;
 
 import jdk.graal.compiler.util.json.JsonWriter;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTGOTOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTGOTOptions.java
@@ -25,6 +25,7 @@
 package com.oracle.svm.hosted.pltgot;
 
 import com.oracle.svm.core.option.HostedOptionKey;
+
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionType;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTStubGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTStubGenerator.java
@@ -27,6 +27,7 @@
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.meta.SharedMethod;
+
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public interface PLTStubGenerator {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/aarch64/AArch64HostedPLTGOTConfiguration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/aarch64/AArch64HostedPLTGOTConfiguration.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.hosted.pltgot.aarch64;
 
+import java.lang.reflect.Method;
+
 import com.oracle.svm.core.pltgot.aarch64.AArch64ExitMethodAddressResolutionOp;
 import com.oracle.svm.core.pltgot.aarch64.AArch64MethodAddressResolutionDispatcher;
 import com.oracle.svm.hosted.pltgot.HostedPLTGOTConfiguration;
@@ -36,8 +38,6 @@
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.RegisterValue;
 
-import java.lang.reflect.Method;
-
 public final class AArch64HostedPLTGOTConfiguration extends HostedPLTGOTConfiguration {
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/aarch64/AArch64PLTStubGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/aarch64/AArch64PLTStubGenerator.java
@@ -38,13 +38,13 @@
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.pltgot.GOTAccess;
 import com.oracle.svm.core.pltgot.aarch64.AArch64MethodAddressResolutionDispatcher;
+import com.oracle.svm.hosted.image.NativeImage;
+import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.pltgot.HostedPLTGOTConfiguration;
 import com.oracle.svm.hosted.pltgot.PLTSectionSupport;
 import com.oracle.svm.hosted.pltgot.PLTStubGenerator;
-import com.oracle.svm.hosted.image.NativeImage;
-import com.oracle.svm.hosted.meta.HostedMethod;
-
 import com.oracle.svm.hosted.pltgot.amd64.AMD64PLTStubGenerator;
+
 import jdk.graal.compiler.asm.Assembler;
 import jdk.graal.compiler.asm.Label;
 import jdk.graal.compiler.asm.aarch64.AArch64Address;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/amd64/AMD64PLTStubGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/amd64/AMD64PLTStubGenerator.java
@@ -33,14 +33,14 @@
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind;
 import com.oracle.svm.core.meta.SharedMethod;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.core.pltgot.amd64.AMD64MethodAddressResolutionDispatcher;
 import com.oracle.svm.core.pltgot.GOTAccess;
+import com.oracle.svm.core.pltgot.amd64.AMD64MethodAddressResolutionDispatcher;
+import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.image.NativeImage;
+import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.pltgot.HostedPLTGOTConfiguration;
 import com.oracle.svm.hosted.pltgot.PLTSectionSupport;
 import com.oracle.svm.hosted.pltgot.PLTStubGenerator;
-import com.oracle.svm.hosted.image.NativeImage;
-import com.oracle.svm.hosted.meta.HostedMethod;
 
 import jdk.graal.compiler.asm.Assembler;
 import jdk.graal.compiler.asm.amd64.AMD64Address;
