Rename org.graalvm.util package

compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/ObjdumpDisassemblerProvider.java

@@ -41,7 +41,7 @@
 import org.graalvm.compiler.options.OptionType;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.serviceprovider.ServiceProvider;
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.CodeUtil;

compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java

@@ -56,7 +56,7 @@
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Not;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt;
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 
 /**
  * Information about arithmetic operations.

compiler/src/org.graalvm.compiler.hotspot.management.libgraal/src/org/graalvm/compiler/hotspot/management/LibGraalMBean.java

@@ -56,7 +56,7 @@
 import org.graalvm.libgraal.LibGraalScope;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 
 /**
  * Encapsulates a handle to a {@link DynamicMBean} object in the libgraal heap. Implements the

compiler/src/org.graalvm.compiler.hotspot.management.libgraal/src/org/graalvm/compiler/hotspot/management/libgraal/JMXToLibGraalEntryPoints.java

@@ -62,7 +62,7 @@
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CLongPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 import org.graalvm.word.WordFactory;
 
 /**

compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java

@@ -104,7 +104,7 @@
 import org.graalvm.libgraal.LibGraal;
 import org.graalvm.libgraal.LibGraalIsolate;
 import org.graalvm.libgraal.LibGraalScope;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java

@@ -27,7 +27,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo;
-import static org.graalvm.util.CollectionsUtil.anyMatch;
+import static org.graalvm.utils.CollectionsUtil.anyMatch;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java

@@ -28,7 +28,7 @@
 import static org.graalvm.compiler.core.common.GraalOptions.RegisterPressure;
 import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets;
 import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP;
-import static org.graalvm.util.CollectionsUtil.allMatch;
+import static org.graalvm.utils.CollectionsUtil.allMatch;
 
 import java.util.ListIterator;
 import java.util.concurrent.atomic.AtomicInteger;

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java

@@ -64,7 +64,7 @@
 import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.Assumptions;

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValuePhiNode.java

@@ -36,7 +36,7 @@
 import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
 import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 
 /**
  * Value {@link PhiNode}s merge data flow values at control flow merges.

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java

@@ -182,7 +182,7 @@
 import org.graalvm.compiler.replacements.nodes.LoadSnippetVarargParameterNode;
 import org.graalvm.compiler.replacements.nodes.MacroWithExceptionNode;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordBase;
 

compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java

@@ -42,7 +42,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 import org.junit.Assume;
 
 /**

compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/TruffleToLibGraalEntryPoints.java

@@ -121,7 +121,7 @@
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.nativeimage.c.type.VoidPointer;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 import org.graalvm.word.WordFactory;
 
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;

compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/IgvSupport.java

@@ -40,7 +40,7 @@
 import org.graalvm.graphio.GraphOutput;
 import org.graalvm.libgraal.LibGraalObject;
 import org.graalvm.libgraal.LibGraalScope;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 
 final class IgvSupport extends LibGraalObject implements TruffleDebugContext {
 

compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java

@@ -40,7 +40,7 @@
 import org.graalvm.libgraal.LibGraal;
 import org.graalvm.libgraal.LibGraalObject;
 import org.graalvm.libgraal.LibGraalScope;
-import org.graalvm.util.OptionsEncoder;
+import org.graalvm.utils.OptionsEncoder;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 

compiler/src/org.graalvm.compiler.util.test/src/org/graalvm/compiler/util/test/CollectionUtilTest.java

@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.graalvm.util.CollectionsUtil;
+import org.graalvm.utils.CollectionsUtil;
 import org.junit.Assert;
 import org.junit.Test;
 

compiler/src/org.graalvm.compiler.util.test/src/org/graalvm/compiler/util/test/OptionsEncoderTest.java

@@ -25,8 +25,8 @@
 package org.graalvm.compiler.util.test;
 
 import java.lang.annotation.ElementType;
-import static org.graalvm.util.OptionsEncoder.decode;
-import static org.graalvm.util.OptionsEncoder.encode;
+import static org.graalvm.utils.OptionsEncoder.decode;
+import static org.graalvm.utils.OptionsEncoder.encode;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Collections;

sdk/mx.sdk/suite.py

@@ -330,7 +330,7 @@
       "javaCompliance" : "11+",
       "workingSets" : "API,SDK",
     },
-    "org.graalvm.util" : {
+    "org.graalvm.utils" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "requiresConcealed" : {
@@ -371,7 +371,7 @@
         "org.graalvm.nativeimage",
         "org.graalvm.collections",
         "org.graalvm.home",
-        "org.graalvm.util",
+        "org.graalvm.utils",
       ],
       "distDependencies" : [],
       "javadocType": "api",
@@ -396,15 +396,15 @@
           "org.graalvm.polyglot.management",
           "org.graalvm.polyglot",
           "org.graalvm.options",
-          "org.graalvm.util",
+          "org.graalvm.utils",
           "org.graalvm.word",
           "org.graalvm.polyglot.impl to org.graalvm.truffle, com.oracle.graal.graal_enterprise",
           "org.graalvm.word.impl to jdk.internal.vm.compiler",
           "org.graalvm.nativeimage.impl to org.graalvm.nativeimage.builder,org.graalvm.nativeimage.configure,com.oracle.svm.svm_enterprise",
         ],
         "uses" : [
           "org.graalvm.polyglot.impl.AbstractPolyglotImpl",
-          "org.graalvm.util.AnnotationExtracter",
+          "org.graalvm.utils.AnnotationExtracter",
         ],
         "opens" : [
           "org.graalvm.polyglot to org.graalvm.truffle"

sdk/src/org.graalvm.util/src/org/graalvm/util/AnnotationExtracter.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/AnnotationExtracter.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;

sdk/src/org.graalvm.util/src/org/graalvm/util/CollectionsUtil.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/CollectionsUtil.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;

sdk/src/org.graalvm.util/src/org/graalvm/util/DirectAnnotationAccess.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/DirectAnnotationAccess.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 //Checkstyle: allow reflection
 import java.lang.annotation.Annotation;

sdk/src/org.graalvm.util/src/org/graalvm/util/GuardedAnnotationAccess.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/GuardedAnnotationAccess.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;

sdk/src/org.graalvm.util/src/org/graalvm/util/OptionsEncoder.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/OptionsEncoder.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

sdk/src/org.graalvm.util/src/org/graalvm/util/TypedDataInputStream.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/TypedDataInputStream.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.io.DataInputStream;
 import java.io.IOException;

sdk/src/org.graalvm.util/src/org/graalvm/util/TypedDataOutputStream.java → sdk/src/org.graalvm.utils/src/org/graalvm/utils/TypedDataOutputStream.java

@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.util;
+package org.graalvm.utils;
 
 import java.io.DataOutputStream;
 import java.io.IOException;

substratevm/mx.substratevm/suite.py

@@ -1131,6 +1131,7 @@
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
                     "com.oracle.svm.core.option                   to com.oracle.svm_enterprise.ml_dataset",
+                    "com.oracle.svm.core.annotate",
                     "* to org.graalvm.nativeimage.base,jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
                 ],
                 "opens" : [

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java

@@ -105,7 +105,7 @@
 import org.graalvm.compiler.replacements.nodes.ObjectClone;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.compiler.word.WordCastNode;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.LoadFieldTypeFlow.LoadInstanceFieldTypeFlow;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisField.java

@@ -35,7 +35,7 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.graal.pointsto.api.DefaultUnsafePartition;
 import com.oracle.graal.pointsto.api.HostVM;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java

@@ -45,7 +45,7 @@
 import org.graalvm.compiler.nodes.GraphDecoder;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.api.PointstoOptions;

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

@@ -42,7 +42,7 @@
 
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 import org.graalvm.word.WordBase;
 
 import com.oracle.graal.pointsto.BigBang;

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java

@@ -82,7 +82,7 @@
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.ReservedRegisters;

substratevm/src/com.oracle.svm.core/.checkstyle_checks.xml

@@ -14,7 +14,7 @@
       <metadata name="net.sf.eclipsecs.core.comment" value="Disallow calls to AnnotatedElement.get(Declared)Annotation(s)."/>
       <property name="severity" value="error"/>
       <property name="format" value="(?&lt;!AnnotationAccess)\.(getAnnotation|getAnnotations|getDeclaredAnnotation|getDeclaredAnnotations|isAnnotationPresent)\b"/>
-      <property name="message" value="Direct calls to java.lang.reflect.AnnotatedElement.get(Declared)Annotation(s) are restricted. Use either org.graalvm.util.GuardedAnnotationAccess or org.graalvm.util.DirectAnnotationAccess methods. (Use &quot;// Checkstyle: allow direct annotation access... // Checkstyle: disallow direct annotation access&quot; to disable this check.)"/>
+      <property name="message" value="Direct calls to java.lang.reflect.AnnotatedElement.get(Declared)Annotation(s) are restricted. Use either org.graalvm.utils.GuardedAnnotationAccess or org.graalvm.utils.DirectAnnotationAccess methods. (Use &quot;// Checkstyle: allow direct annotation access... // Checkstyle: disallow direct annotation access&quot; to disable this check.)"/>
       <property name="ignoreComments" value="true"/>
     </module>
     <module name="SuppressionCommentFilter">

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java

@@ -31,7 +31,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.svm.core.CalleeSavedRegisters;
 import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Uninterruptible.java

@@ -33,8 +33,8 @@
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.c.function.CFunction;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
-import org.graalvm.util.DirectAnnotationAccess;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.DirectAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.snippets.KnownIntrinsics;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointErrors.java

@@ -31,7 +31,7 @@
 import java.lang.reflect.Field;
 import java.util.Arrays;
 
-import org.graalvm.util.DirectAnnotationAccess;
+import org.graalvm.utils.DirectAnnotationAccess;
 
 import com.oracle.svm.core.util.VMError;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/libc/LibCBase.java

@@ -33,7 +33,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 public interface LibCBase {
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java

@@ -27,7 +27,7 @@
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.c.constant.CEnum;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.SubstrateTargetDescription;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java

@@ -81,7 +81,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.util.DirectAnnotationAccess;
+import org.graalvm.utils.DirectAnnotationAccess;
 
 import com.oracle.svm.core.SubstrateTargetDescription;
 import com.oracle.svm.core.config.ConfigurationValues;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java

@@ -31,7 +31,7 @@
 import org.graalvm.compiler.phases.tiers.MidTierContext;
 import org.graalvm.nativeimage.c.function.CFunction;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
-import org.graalvm.util.DirectAnnotationAccess;
+import org.graalvm.utils.DirectAnnotationAccess;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.graal.code.SubstrateBackend;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java

@@ -37,7 +37,7 @@
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.word.WordOperationPlugin;
 import org.graalvm.compiler.word.WordTypes;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordTypes.java

@@ -26,7 +26,7 @@
 
 import org.graalvm.compiler.word.WordTypes;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
-import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.utils.GuardedAnnotationAccess;
 
 import com.oracle.svm.core.util.UserError;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -61,7 +61,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
-import org.graalvm.util.DirectAnnotationAccess;
+import org.graalvm.utils.DirectAnnotationAccess;
 
 import com.oracle.svm.core.RuntimeAssertionsSupport;
 import com.oracle.svm.core.SubstrateUtil;