diff --git a/compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java b/compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java index 443745178fc9..4659afd2a409 100644 --- a/compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java +++ b/compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java @@ -296,7 +296,7 @@ private void createStubs(AbstractProcessor processor, TargetVM targetVM, TypeEle case substrate: imports.addAll(List.of( "com.oracle.svm.core.SubstrateTargetDescription", - "com.oracle.svm.core.annotate.Uninterruptible", + "com.oracle.svm.core.Uninterruptible", "com.oracle.svm.core.snippets.SubstrateForeignCallTarget", "com.oracle.svm.core.cpufeature.Stubs", "com.oracle.svm.graal.RuntimeCPUFeatureRegion", diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md index f75278aedfde..d5abea2cd964 100644 --- a/sdk/CHANGELOG.md +++ b/sdk/CHANGELOG.md @@ -5,6 +5,8 @@ This changelog summarizes major changes between GraalVM SDK versions. The main f ## Version 22.3.0 * (GR-39852) Native Image API: Added FieldValueTransformer API * (GR-35358) Added `Context.Builder.allowInnerContextOptions(boolean)` which allows the context to spawn inner contexts and modify and override language options. The default value for this privilege is set depending `Context.Builder.allowAllPrivilages(boolean)` is set or not. Do not enable this privilege in security sensitive scenarios. +* (GR-40198) Introduce public API for programmatic JNI / Resource / Proxy / Serialization registration from Feature classes during the image build. +* (GR-38909) Added Native Image com.oracle.svm.core.annotate annotation classes (@Alias, @TargetClass, @Substitute, ...). ## Version 22.2.0 * (GR-38925) Added `Value.hasMetaParents() and Value.getMetaParents()` that allow lookup of the hierarchy of parents for meta objects (e.g. super class or implemented interface of Java classes). diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py index 7599191973ca..f48470686454 100644 --- a/sdk/mx.sdk/suite.py +++ b/sdk/mx.sdk/suite.py @@ -282,6 +282,16 @@ "javaCompliance" : "11+", "workingSets" : "API,SDK", }, + "com.oracle.svm.core.annotate" : { + "subDir" : "src", + "sourceDirs" : ["src"], + "dependencies" : [ + "org.graalvm.nativeimage", + ], + "checkstyle" : "org.graalvm.word", + "javaCompliance" : "11+", + "workingSets" : "API,SDK", + }, "org.graalvm.nativeimage.test" : { "subDir" : "src", "sourceDirs" : ["src"], @@ -395,6 +405,7 @@ "dependencies" : [ "org.graalvm.polyglot", "org.graalvm.nativeimage", + "com.oracle.svm.core.annotate", "org.graalvm.collections", "org.graalvm.home", ], @@ -407,6 +418,7 @@ "org.graalvm.collections", "org.graalvm.home", "org.graalvm.home.impl", + "com.oracle.svm.core.annotate", "org.graalvm.nativeimage.hosted", "org.graalvm.nativeimage.c.function", "org.graalvm.nativeimage.c.struct", diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Alias.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Alias.java similarity index 52% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Alias.java rename to sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Alias.java index dc10febad85d..1e85a524cdf3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Alias.java +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Alias.java @@ -1,26 +1,42 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ package com.oracle.svm.core.annotate; @@ -53,6 +69,8 @@ * When aliasing *non-static* inner classes the constructors are passed a hidden argument which is * the outer class. When writing an @Alias for a constructor of a *non-static* inner classes, you * have to (a) explicitly declare that parameter, and (b) supply it in the calls. + * + * @since 22.3 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AnnotateOriginal.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AnnotateOriginal.java new file mode 100644 index 000000000000..9302b0f53dfd --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AnnotateOriginal.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * This annotation allows to add additional annotations to existing methods but keep the + * implementation as it is. + *

+ * The element can also be annotated with {@link TargetElement} to specify additional properties. + * See {@link TargetClass} for an overview of the annotation system. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface AnnotateOriginal { +} diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AutomaticFeature.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AutomaticFeature.java new file mode 100644 index 000000000000..00248d233d26 --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/AutomaticFeature.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * Supported API is available to replace this non-API annotation: Instead of using this annotation, + * use {@code "--features "} in the {@code Args} of a + * {@code native-image.properties} file to ensure a user-provided feature gets processed. + * + * Feature classes can use this annotation are unconditionally added when they are reachable on the + * class path. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface AutomaticFeature { +} diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Delete.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Delete.java new file mode 100644 index 000000000000..e4d4a75c443a --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Delete.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * Mechanism to ensures that an element is not used. + *

+ * The element can also be annotated with {@link TargetElement} to specify additional properties. + * See {@link TargetClass} for an overview of the annotation system. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface Delete { + + /** + * Documents the reason why the annotated element is deleted. + * + * @since 22.3 + */ + String value() default ""; +} diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Inject.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Inject.java new file mode 100644 index 000000000000..8917460eb494 --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Inject.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * Injects the annotated field into the {@link TargetClass}. + * + * The field must not be declared static. If instances of the target class are in the image heap, + * the field also needs to be annotated with {@link RecomputeFieldValue} to provide a value for the + * injected field. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface Inject { +} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InjectAccessors.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/InjectAccessors.java similarity index 51% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InjectAccessors.java rename to sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/InjectAccessors.java index 457c7a0e4699..0fa5cec61b81 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InjectAccessors.java +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/InjectAccessors.java @@ -1,37 +1,53 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * The Universal Permissive License (UPL), Version 1.0 * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * (a) the Software, and * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ package com.oracle.svm.core.annotate; -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + /** * Inject accessor methods for the field denoted using an {@link Alias} annotation. All loads and * stores to the original field are redirected to accessor methods located in the class provided in @@ -57,11 +73,15 @@ * accessors, that would lead to a recursive call of the accessors. Instead, data must be stored in * either a new static field, or an {@link Inject injected} instance field. * + * @since 22.3 */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) @Platforms(Platform.HOSTED_ONLY.class) public @interface InjectAccessors { + /** + * @since 22.3 + */ Class value(); } diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/KeepOriginal.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/KeepOriginal.java new file mode 100644 index 000000000000..d59a7c5b851f --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/KeepOriginal.java @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * If a class annotated with {@link TargetClass} is also annotated with {@link Substitute}, all + * non-substituted methods in that class are by default treated as {@link Delete deleted}. This + * annotation changes the behavior: A method annotated with {@link KeepOriginal} keeps the original + * definition of the method. + *

+ * If this annotation is used to the {@link Substitute * substituted} type itself, then the original + * definition of all methods and fields in the target type are kept by default. + *

+ * The element can also be annotated with {@link TargetElement} to specify additional properties. + * See {@link TargetClass} for an overview of the annotation system. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface KeepOriginal { +} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java similarity index 65% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java rename to sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java index f835bbed1c0a..7d5b5c2841a4 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java @@ -1,26 +1,42 @@ /* - * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * The Universal Permissive License (UPL), Version 1.0 * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * (a) the Software, and * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ package com.oracle.svm.core.annotate; @@ -44,60 +60,85 @@ *

* This annotation must be used on a field also annotated with {@link Alias} to specify the field * whose value needs to be changed. + * + * @since 22.3 */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) @Platforms(Platform.HOSTED_ONLY.class) public @interface RecomputeFieldValue { + /** + * @since 22.3 + */ enum Kind { /** * The initial field value is not modified. This is the default behavior when no * {@link RecomputeFieldValue} annotation is present. + * + * @since 22.3 */ None, /** * The field is reset to the default value (null, 0, false). + * + * @since 22.3 */ Reset, /** * The object field is set to a instance of {@link #declClass} created by calling the * default constructor. + * + * @since 22.3 */ NewInstance, /** * The object field is set to a instance of {@link #declClass} created by calling the * default constructor when the target field value is not null. + * + * @since 22.3 */ NewInstanceWhenNotNull, /** * The field is set to the value assigned to the {@link Alias} field. + * + * @since 22.3 */ FromAlias, /** * The int or long field is set to the offset of the field named {@link #name()} of the * class {@link #declClass}, as it would be computed by * {@link sun.misc.Unsafe#objectFieldOffset}. + * + * @since 22.3 */ FieldOffset, /** * The int or long field is set to the offset of the first array element of the array class * {@link #declClass}, as it would be computed by * {@link sun.misc.Unsafe#arrayBaseOffset(Class)}. + * + * @since 22.3 */ ArrayBaseOffset, /** * The int or long field is set to the element size array class {@link #declClass}, as it * would be computed by {@link sun.misc.Unsafe#arrayIndexScale(Class)}. + * + * @since 22.3 */ ArrayIndexScale, /** * The int or long field is set to the log2 of {@link #ArrayIndexScale}. + * + * @since 22.3 */ ArrayIndexShift, /** * Special support for field offsets used by * java.util.concurrent.atomic.AtomicXxxFieldUpdater. + * + * @since 22.3 */ AtomicFieldUpdaterOffset, /** @@ -105,20 +146,28 @@ enum Kind { * a valid field offset in the hosted universe, and the new value is the field offset of the * same field in the substrate universe. The field is looked up in the class * {@link #declClass}. + * + * @since 22.3 */ TranslateFieldOffset, /** * Marker value that the field is intercepted by some manual logic. + * + * @since 22.3 */ Manual, /** * Use a {@link FieldValueTransformer}, which is specified as the target class. + * + * @since 22.3 */ Custom, } /** * The kind of the recomputation performed. + * + * @since 22.3 */ Kind kind(); @@ -127,6 +176,8 @@ enum Kind { * specified by {@link #declClassName()} is used. If neither {@link #declClass()} nor * {@link #declClassName()} is specified, then the class specified by the {@link TargetClass} * annotation is used. + * + * @since 22.3 */ Class declClass() default RecomputeFieldValue.class; @@ -135,21 +186,29 @@ enum Kind { * specified by {@link #declClass()} is used. If neither {@link #declClass()} nor * {@link #declClassName()} is specified, then the class specified by the {@link TargetClass} * annotation is used. + * + * @since 22.3 */ String declClassName() default ""; /** * The name parameter for the recomputation. + * + * @since 22.3 */ String name() default ""; /** * Treat the value as final, to enforce constant folding already during static analysis. + * + * @since 22.3 */ boolean isFinal() default false; /** * If true, ignores previously computed values and calculates the value for every field read. + * + * @since 22.3 */ boolean disableCaching() default false; } diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Substitute.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Substitute.java new file mode 100644 index 000000000000..31333fdad339 --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/Substitute.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * When used to annotate a method, it indicates that a method declaration is intended to be a + * substitute for a method declaration in another class. A substitute method must be declared in a + * class annotated with {@link TargetClass} as the {@link TargetClass#value() value} element of that + * annotation specifies the class containing the method to be substituted (the substitutee + * class). + *

+ * The method to be substituted is determined based on a name and a list of parameter types. The + * name is specified by an optional {@link TargetElement#name()} element of this annotation. If this + * element is not specified, then the name of the substitution method is used. The parameter types + * are those of the substitution method. + *

+ * There must never be an explicit call to a non-static method annotated with {@link Substitute} + * unless it is from another non-static method in the same class. + *

+ * When used to annotate a class, it indicates that the class is intended to be a full substitute + * for the class specified via {@link TargetClass}. All methods in the target class that are not + * substituted in the annotated class are implicitly treated as {@link Delete}d. + *

+ * See {@link TargetClass} for an overview of the annotation system. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.FIELD}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface Substitute { + /** + * @since 22.3 + */ + boolean polymorphicSignature() default false; +} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetClass.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetClass.java similarity index 68% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetClass.java rename to sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetClass.java index c55808923338..84854afb7240 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetClass.java +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetClass.java @@ -1,26 +1,42 @@ /* - * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * The Universal Permissive License (UPL), Version 1.0 * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * (a) the Software, and * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ package com.oracle.svm.core.annotate; @@ -73,6 +89,8 @@ * method annotated with {@link KeepOriginal} keeps the original method, i.e., calls to the original * method still call the original method. * + * + * @since 22.3 */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @@ -84,6 +102,8 @@ * * Either {@link #value()}, {@link #className()} or {@link #classNameProvider()} element can be * used to specify the substitutee class. + * + * @since 22.3 */ Class value() default TargetClass.class; @@ -94,6 +114,8 @@ * * Either {@link #value()}, {@link #className()} or {@link #classNameProvider()} element can be * used to specify the substitutee class. + * + * @since 22.3 */ String className() default ""; @@ -106,11 +128,15 @@ * * Either {@link #value()}, {@link #className()} or {@link #classNameProvider()} element can be * used to specify the substitutee class. + * + * @since 22.3 */ Class> classNameProvider() default NoClassNameProvider.class; /** * Specifies the suffix of the substitutee class name when it is an inner class. + * + * @since 22.3 */ String[] innerClass() default {}; @@ -120,18 +146,34 @@ * * The classes must either implement {@link BooleanSupplier} or {@link Predicate}<String> * (the parameter for {@link Predicate#test} is the "original" class name as a {@link String}). + * + * @since 22.3 */ Class[] onlyWith() default TargetClass.AlwaysIncluded.class; - /** The default value for the {@link TargetClass#onlyWith()} attribute. */ + /** + * The default value for the {@link TargetClass#onlyWith()} attribute. + * + * @since 22.3 + */ class AlwaysIncluded implements BooleanSupplier { + AlwaysIncluded() { + } + + /** + * @since 22.3 + */ @Override public boolean getAsBoolean() { return true; } } - /** Marker value for {@link #classNameProvider} that no class name provider should be used. */ + /** + * Marker value for {@link #classNameProvider} that no class name provider should be used. + * + * @since 22.3 + */ interface NoClassNameProvider extends Function { } } diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetElement.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetElement.java new file mode 100644 index 000000000000..e02dc0a8c3e0 --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/TargetElement.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package com.oracle.svm.core.annotate; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.function.BooleanSupplier; +import java.util.function.Predicate; + +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + +/** + * Specifies additional properties for an element also annotated with {@link Alias}, {@link Delete}, + * {@link Substitute}, {@link AnnotateOriginal}, or {@link KeepOriginal}. + *

+ * See {@link TargetClass} for an overview of the annotation system. + * + * @since 22.3 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) +@Platforms(Platform.HOSTED_ONLY.class) +public @interface TargetElement { + + /** + * @since 22.3 + */ + String CONSTRUCTOR_NAME = ""; + + /** + * The name of the field or method in the original class. If the default value is specified for + * this element, then the name of the annotated field or method is used. + *

+ * To make a reference to a constructor, use the name {@link #CONSTRUCTOR_NAME}. + * + * @since 22.3 + */ + String name() default ""; + + /** + * Substitute only if all provided predicates are true (default: unconditional substitution that + * is always included). + * + * The classes must either implement {@link BooleanSupplier} or {@link Predicate}<Class> + * (the parameter for {@link Predicate#test} is the "original" class as specified by the + * {@link TargetClass} annotation, as a {@link Class}). + * + * @since 22.3 + */ + Class[] onlyWith() default TargetClass.AlwaysIncluded.class; +} diff --git a/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/package-info.java b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/package-info.java new file mode 100644 index 000000000000..a96c7d5dfca4 --- /dev/null +++ b/sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/package-info.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * This package contains annotations that configure the substitution mechanism of GraalVM Native + * Image. Annotated classes and methods modify the behavior of the class referenced by + * {@link com.oracle.svm.core.annotate.TargetClass}. + * + * Important: this package is not part of the supported API. It exists, and is exported in the + * module descriptor, for compatibility reasons only. + * + * @since 22.3 + */ +package com.oracle.svm.core.annotate; diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md index bff1b665bd55..ecf08e03e429 100644 --- a/substratevm/CHANGELOG.md +++ b/substratevm/CHANGELOG.md @@ -12,6 +12,7 @@ This changelog summarizes major changes to GraalVM Native Image. * (GR-40264) Add `--enable-monitoring=` option to enable fine-grained control over monitoring features enabled in native executables. `-H:±AllowVMInspection` is now deprecated and will be removed in a future release. * (GR-15630) Allow multiple classes with the same name from different class loaders. * (GR-40198) Introduce public API for programmatic JNI / Resource / Proxy / Serialization registration from Feature classes during the image build. +* (GR-38909) Moved strictly-internal annotation classes (e.g. @AlwaysInline, @NeverInline, @Uninterruptible, ...) out of com.oracle.svm.core.annotate. Moved remaining annotation classes to org.graalvm.sdk module. ## Version 22.2.0 * (GR-20653) Re-enable the usage of all CPU features for JIT compilation on AMD64. diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py index a51c04a0db5f..8d7c31efa2da 100644 --- a/substratevm/mx.substratevm/suite.py +++ b/substratevm/mx.substratevm/suite.py @@ -856,7 +856,7 @@ "subDir": "src", "sourceDirs": ["src"], "dependencies": [ - "com.oracle.svm.core", + "sdk:GRAAL_SDK", ], "checkstyle": "com.oracle.svm.core", "javaCompliance": "11+", diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java index 9d2e30421b56..082e2752c1df 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java @@ -35,7 +35,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateGCOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.PhysicalMemory; import com.oracle.svm.core.heap.ReferenceAccess; import com.oracle.svm.core.jdk.UninterruptibleUtils; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java index 6de6873033eb..bd16a39b9df6 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java @@ -29,7 +29,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.GCCause; import com.oracle.svm.core.util.TimeUtils; import com.oracle.svm.core.util.UnsignedUtils; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java index 15a6eef96953..0c076173d6f2 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java @@ -37,9 +37,9 @@ import com.oracle.svm.core.MemoryWalker; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.ObjectVisitor; import com.oracle.svm.core.util.PointerUtils; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java index 5ff566af2c82..2d18a356ece7 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java @@ -29,7 +29,7 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.ObjectVisitor; public interface AuxiliaryImageHeap { diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunksAccounting.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunksAccounting.java index e5253deb51e3..17c24b576832 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunksAccounting.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunksAccounting.java @@ -29,7 +29,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.log.Log; /** diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java index c6cb4641a535..e556ce773b81 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java @@ -29,7 +29,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.log.Log; /** diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java index 88e1eefa7920..26d08386c654 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java @@ -48,10 +48,10 @@ import com.oracle.svm.core.SubstrateGCOptions; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyObjectsWalker.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyObjectsWalker.java index 3788ec2572df..f05a03126e03 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyObjectsWalker.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyObjectsWalker.java @@ -29,8 +29,8 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java index 95205bc7dc98..b5b0d7f33574 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java @@ -30,7 +30,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.ObjectReferenceVisitor; import com.oracle.svm.core.heap.ReferenceAccess; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java index 88adc11c4a0b..9a8b48845d46 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java @@ -27,8 +27,8 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.heap.ObjectVisitor; import com.oracle.svm.core.hub.InteriorObjRefWalker; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapAccounting.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapAccounting.java index 70c630d7d825..599adb600cf0 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapAccounting.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapAccounting.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.thread.VMOperation; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java index 962423f5c1f2..9baa06919ec8 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java @@ -40,9 +40,9 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.struct.PinnedObjectField; import com.oracle.svm.core.heap.ObjectVisitor; import com.oracle.svm.core.hub.LayoutEncoding; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java index 1484146c83ae..4df6532b8e51 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java @@ -35,8 +35,8 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.MemoryWalker; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.HeapChunk.Header; import com.oracle.svm.core.genscavenge.UnalignedHeapChunk.UnalignedHeader; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java index 590a5dcda128..69f4b5373efb 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java @@ -47,11 +47,11 @@ import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.ThreadLocalAllocation.Descriptor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java index ba33f07b109d..9c2be3f9a442 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java @@ -33,7 +33,7 @@ import com.oracle.svm.core.SubstrateGCOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.UserError; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java index 1b3eb1b26635..dac4008c4d59 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java @@ -29,9 +29,9 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.UnalignedHeapChunk.UnalignedHeader; import com.oracle.svm.core.hub.LayoutEncoding; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java index cb1e2d91ce15..d035d94df0fe 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.heap.ObjectVisitor; import com.oracle.svm.core.hub.LayoutEncoding; import com.oracle.svm.core.os.CommittedMemoryProvider; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEventSupport.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEventSupport.java index e7b1d016609a..5b1a474db52b 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEventSupport.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEventSupport.java @@ -32,7 +32,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.GCCause; import com.oracle.svm.core.jfr.HasJfrSupport; import com.oracle.svm.core.jfr.JfrEvent; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java index 04eb358a625c..1a930ece064d 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java @@ -40,8 +40,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.config.ObjectLayout; import com.oracle.svm.core.heap.Heap; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java index 8b3e042e34f1..395e39ef03fe 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java @@ -32,8 +32,8 @@ import org.graalvm.word.UnsignedWord; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.GCImpl.ChunkReleaser; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.ObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java index 35e5f7b4791f..b8d496240607 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java @@ -37,8 +37,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java index e8892e7086da..2e896a58770a 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java @@ -33,7 +33,7 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.ObjectHeader; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.LayoutEncoding; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java index 261013c9164e..9b15f461e7d0 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java @@ -29,7 +29,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.GCCause; import com.oracle.svm.core.util.UnsignedUtils; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java index 3c0a614336fb..e0bffb409384 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java @@ -35,7 +35,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.heap.ObjectReferenceVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java index 2ecddc381c75..33f5a1a978c2 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java @@ -29,7 +29,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.heap.ObjectReferenceVisitor; import com.oracle.svm.core.heap.ReferenceAccess; import com.oracle.svm.core.heap.RuntimeCodeCacheCleaner; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java index b09edb0f5e47..5440ef78c39d 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.SubstrateGCOptions; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.RuntimeCodeCache.CodeInfoVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeInfoGCSupportImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeInfoGCSupportImpl.java index ebbf5d43b79e..a0f7c43b3d59 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeInfoGCSupportImpl.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeInfoGCSupportImpl.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.heap.RuntimeCodeInfoGCSupport; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java index c7ba62e9fcc7..206eb97a519c 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java @@ -27,7 +27,7 @@ import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY; import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import org.graalvm.compiler.word.Word; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; @@ -38,7 +38,7 @@ import com.oracle.svm.core.MemoryWalker; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.GCImpl.ChunkReleaser; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.ObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/StackVerifier.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/StackVerifier.java index eb0802f16273..abc53e03442b 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/StackVerifier.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/StackVerifier.java @@ -32,8 +32,8 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java index 73a8a38e0839..3bfd58aa59e9 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java @@ -49,8 +49,8 @@ import com.oracle.svm.core.SubstrateGCOptions; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.UnalignedHeapChunk.UnalignedHeader; import com.oracle.svm.core.genscavenge.graal.nodes.FormatArrayNode; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java index 299309cb970b..8761821484bd 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java @@ -37,9 +37,9 @@ import com.oracle.svm.core.MemoryWalker; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.genscavenge.remset.RememberedSet; import com.oracle.svm.core.heap.ObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java index 209fbad2731d..f25fbcf3fcd6 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java @@ -30,8 +30,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.genscavenge.GCImpl.ChunkReleaser; import com.oracle.svm.core.heap.ObjectVisitor; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java index 902eb59b5dec..890774f41c0e 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java @@ -36,7 +36,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.genscavenge.AlignedHeapChunk; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java index c9f990d84358..40ec1153d282 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java @@ -31,7 +31,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.GCImpl; import com.oracle.svm.core.genscavenge.GreyToBlackObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java index bfca620613c1..e613414131bd 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.genscavenge.remset; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java index 7693eda72ae0..8fec4384578c 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java @@ -33,7 +33,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.GreyToBlackObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java index 9f97c48bc79d..d6b1725a2967 100644 --- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java +++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java @@ -32,7 +32,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.genscavenge.AlignedHeapChunk.AlignedHeader; import com.oracle.svm.core.genscavenge.GreyToBlackObjectVisitor; import com.oracle.svm.core.genscavenge.Space; 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 index 924e2e2a9c2d..b56b381fce35 100644 --- 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 @@ -138,6 +138,7 @@ import com.oracle.svm.core.deopt.DeoptimizedFrame; import com.oracle.svm.core.deopt.Deoptimizer; import com.oracle.svm.core.graal.code.PatchConsumerFactory; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.graal.code.SubstrateBackend; import com.oracle.svm.core.graal.code.SubstrateCallingConvention; import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind; @@ -535,9 +536,9 @@ public SharedMethod getMethod() { * * Only emit vzeroupper if the call uses a * {@linkplain SubstrateAMD64LIRGenerator#getDestroysCallerSavedRegisters caller-saved} calling - * convention. For {@link com.oracle.svm.core.annotate.StubCallingConvention stub calling - * convention} calls, which are {@linkplain SharedMethod#hasCalleeSavedRegisters() - * callee-saved}, all handling is done on the callee side. + * convention. For {@link StubCallingConvention stub calling convention} calls, which are + * {@linkplain SharedMethod#hasCalleeSavedRegisters() callee-saved}, all handling is done on the + * callee side. * * No vzeroupper is emitted for {@linkplain #isRuntimeToRuntimeCall runtime-to-runtime calls}, * because both, the caller and the callee, have been compiled using the CPU features. diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java index 5af020326543..7e6fec861aa0 100644 --- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java +++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java @@ -44,7 +44,7 @@ import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.llvm.util.LLVMDirectives; import com.oracle.svm.core.snippets.ExceptionUnwind; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixLibCSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixLibCSupport.java index d5b6a283fb3d..9d5cc4366b9f 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixLibCSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixLibCSupport.java @@ -30,7 +30,7 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibCSupport; import com.oracle.svm.core.posix.headers.PosixLibC; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixRawFileOperationSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixRawFileOperationSupport.java index 6c1c03782891..0455c12cc3fa 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixRawFileOperationSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixRawFileOperationSupport.java @@ -38,7 +38,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.os.AbstractRawFileOperationSupport; import com.oracle.svm.core.os.AbstractRawFileOperationSupport.RawFileOperationSupportHolder; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java index dcedc3416c4e..439bdc910a55 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java @@ -30,7 +30,7 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.posix.headers.Errno; import com.oracle.svm.core.posix.headers.darwin.DarwinStat; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java index 5aad8f47ef4b..6322b5c8c1ec 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java @@ -36,8 +36,8 @@ import com.oracle.svm.core.SubstrateSegfaultHandler; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java index 30ee96e63cce..7c8560bd7580 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java @@ -39,8 +39,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.posix.headers.Pthread; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java index 7aa5268f6380..1e490f5cef84 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java @@ -43,7 +43,7 @@ import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.libc.LibCBase; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.posix.headers.Dlfcn; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java index 537e60a29dd0..a175d63978ba 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java @@ -51,7 +51,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.os.VirtualMemoryProvider; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java index 6a27fc38ebf3..2f09934901f3 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/Target_java_lang_System_Posix.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/Target_java_lang_System_Posix.java index f5125788625a..fdfaa00d1d40 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/Target_java_lang_System_Posix.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/Target_java_lang_System_Posix.java @@ -33,7 +33,7 @@ import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Time; import com.oracle.svm.core.posix.headers.Time.timeval; import com.oracle.svm.core.posix.headers.Time.timezone; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UContextRegisterDumper.java index fa64986cf9fa..4380680ca8fb 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UContextRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UContextRegisterDumper.java @@ -27,7 +27,7 @@ import org.graalvm.word.PointerBase; import com.oracle.svm.core.RegisterDumper; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.posix.headers.Signal.ucontext_t; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UnmanagedMemorySupportImpl.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UnmanagedMemorySupportImpl.java index a616371ecd99..eadc9cad6cfe 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UnmanagedMemorySupportImpl.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/UnmanagedMemorySupportImpl.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; class UnmanagedMemorySupportImpl implements UnmanagedMemorySupport { diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java index 1ac137a5c507..eddbff6b0faa 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.RegisterDumper; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.aarch64.AArch64ReservedRegisters; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.posix.UContextRegisterDumper; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java index 88a70b5f6302..d364efcd2bb8 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.RegisterDumper; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.aarch64.AArch64ReservedRegisters; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.posix.UContextRegisterDumper; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java index 8490d75ff8c7..e685eeb0c6a0 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.RegisterDumper; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.amd64.AMD64ReservedRegisters; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.posix.UContextRegisterDumper; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java index f034e5c00530..2a741211d9c4 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.RegisterDumper; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.amd64.AMD64ReservedRegisters; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.posix.UContextRegisterDumper; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinImageHeapProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinImageHeapProvider.java index e7243c7e0581..f49bc24a5d58 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinImageHeapProvider.java @@ -30,7 +30,7 @@ import org.graalvm.word.UnsignedWord; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.os.AbstractCopyingImageHeapProvider; import com.oracle.svm.core.os.ImageHeapProvider; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinLibCSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinLibCSupport.java index a366e855e03f..804bac001ac5 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinLibCSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinLibCSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.posix.darwin; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.PosixLibCSupport; import com.oracle.svm.core.posix.headers.darwin.DarwinErrno; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinStackOverflowSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinStackOverflowSupport.java index c0ca4f56fb31..a286eb7d6f99 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinStackOverflowSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinStackOverflowSupport.java @@ -34,7 +34,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Pthread; import com.oracle.svm.core.posix.headers.darwin.DarwinPthread; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSubstitutions.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSubstitutions.java index c0839c6e549e..dc678baef0c1 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSubstitutions.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.annotate.AutomaticFeature; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Time; import com.oracle.svm.core.posix.headers.Time.timeval; import com.oracle.svm.core.posix.headers.Time.timezone; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinThreadCpuTimeSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinThreadCpuTimeSupport.java index 3a5759cc031e..3268e95d5c09 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinThreadCpuTimeSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinThreadCpuTimeSupport.java @@ -25,7 +25,7 @@ package com.oracle.svm.core.posix.darwin; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadCpuTimeSupport; import com.oracle.svm.core.posix.headers.Pthread; import com.oracle.svm.core.posix.headers.Pthread.pthread_t; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Pthread.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Pthread.java index c3163b6c2540..79ce792e14b2 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Pthread.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Pthread.java @@ -37,7 +37,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Time.timespec; import com.oracle.svm.core.thread.VMThreads.OSThreadHandle; import com.oracle.svm.core.thread.VMThreads.OSThreadId; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/darwin/DarwinStat.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/darwin/DarwinStat.java index 3921210ef92a..422a7649030f 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/darwin/DarwinStat.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/darwin/DarwinStat.java @@ -33,7 +33,7 @@ import org.graalvm.nativeimage.c.struct.CStruct; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.PosixDirectives; // Checkstyle: stop diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java index 2d742f71bb8b..7f3c9d09d32f 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java @@ -53,7 +53,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointErrors; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxLibCSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxLibCSupport.java index 2e9f2072f3ae..2531b7a2fbe8 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxLibCSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxLibCSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.posix.linux; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.libc.LibCSpecific; import com.oracle.svm.core.posix.PosixLibCSupport; import com.oracle.svm.core.posix.headers.linux.LinuxErrno; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxStackOverflowSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxStackOverflowSupport.java index 2edcd4816371..e0c25cc3be30 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxStackOverflowSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxStackOverflowSupport.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.PosixUtils; import com.oracle.svm.core.posix.headers.Pthread; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxSubstitutions.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxSubstitutions.java index f7d824680d49..bc465409d6fd 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxSubstitutions.java @@ -32,7 +32,7 @@ import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Time; import com.oracle.svm.core.posix.headers.Time.timespec; import com.oracle.svm.core.posix.headers.Time.timeval; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java index 558a6d6576e6..dfdff377f2a0 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.posix.linux; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadCpuTimeSupport; import com.oracle.svm.core.posix.headers.Pthread.pthread_t; import com.oracle.svm.core.posix.headers.linux.LinuxPthread; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/ProcFSSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/ProcFSSupport.java index 39510c8016e2..fd0824bc948b 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/ProcFSSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/ProcFSSupport.java @@ -29,7 +29,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.PosixUtils; class ProcFSSupport { diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java index 16ca035a30d4..f601be67bf33 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.StackValue; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.posix.headers.Pthread; import com.oracle.svm.core.posix.headers.Time; import com.oracle.svm.core.posix.headers.Time.timespec; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java index fc2c9f865c6b..87ac1eb4a935 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.posix.pthread; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.core.common.NumUtil; @@ -41,9 +41,9 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.config.ObjectLayout; import com.oracle.svm.core.locks.ClassInstanceReplacer; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java index b162cc359afa..a7041a297caf 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java @@ -48,7 +48,7 @@ import com.oracle.svm.core.annotate.Inject; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java index 6e27652f72c5..498332cdd0ba 100644 --- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java +++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java @@ -34,7 +34,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.headers.LibC; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsImageHeapProvider.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsImageHeapProvider.java index ac3b5b222823..dc106c8b61d3 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsImageHeapProvider.java @@ -43,7 +43,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaLangSubstitutions.java index d52dd2f38e25..0cfda6b9931a 100755 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaLangSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaLangSubstitutions.java @@ -34,7 +34,7 @@ import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.Jvm; @TargetClass(java.lang.System.class) diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsLibCSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsLibCSupport.java index 1078e60721cc..3439385d0267 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsLibCSupport.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsLibCSupport.java @@ -30,7 +30,7 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibCSupport; import com.oracle.svm.core.windows.headers.WindowsLibC; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java index ab933c05ffbe..344dccc3cb83 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java @@ -44,7 +44,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsRegisterDumper.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsRegisterDumper.java index 60bcae60682f..d4de8d661cb9 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsRegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsRegisterDumper.java @@ -33,7 +33,7 @@ import com.oracle.svm.core.RegisterDumper; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.amd64.AMD64ReservedRegisters; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsStackOverflowSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsStackOverflowSupport.java index f0dd3889b2a3..59fe9c63c773 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsStackOverflowSupport.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsStackOverflowSupport.java @@ -36,7 +36,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.stack.StackOverflowCheck; import com.oracle.svm.core.windows.headers.MemoryAPI; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java index da07591a10cc..475e90ffc6ae 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.windows; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import static com.oracle.svm.core.windows.headers.ErrHandlingAPI.EXCEPTION_ACCESS_VIOLATION; import static com.oracle.svm.core.windows.headers.ErrHandlingAPI.EXCEPTION_IN_PAGE_ERROR; @@ -39,8 +39,8 @@ import com.oracle.svm.core.SubstrateSegfaultHandler; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsThreadCpuTimeSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsThreadCpuTimeSupport.java index a3281cdd0b57..45dee7f223eb 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsThreadCpuTimeSupport.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsThreadCpuTimeSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.windows; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadCpuTimeSupport; import com.oracle.svm.core.thread.VMThreads.OSThreadHandle; import com.oracle.svm.core.windows.headers.Process; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUnmanagedMemorySupportImpl.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUnmanagedMemorySupportImpl.java index 0941c3d57356..16725d621b72 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUnmanagedMemorySupportImpl.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUnmanagedMemorySupportImpl.java @@ -34,7 +34,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; class WindowsUnmanagedMemorySupportImpl implements UnmanagedMemorySupport { diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java index 627fc3e979cb..c1698ea9fec8 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java @@ -45,7 +45,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointActions; import com.oracle.svm.core.windows.headers.FileAPI; import com.oracle.svm.core.windows.headers.LibLoaderAPI; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java index 0b0fe3d5eb6c..9be8b99e3365 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.windows; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.core.common.NumUtil; @@ -40,9 +40,9 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.config.ObjectLayout; import com.oracle.svm.core.locks.ClassInstanceReplacer; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java index edfe1e735def..2716dd0e1e72 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java @@ -33,7 +33,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.thread.VMThreads; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVirtualMemoryProvider.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVirtualMemoryProvider.java index d0312aed9b5b..60ea0c72346c 100644 --- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVirtualMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVirtualMemoryProvider.java @@ -44,7 +44,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AlwaysInline.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/AlwaysInline.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AlwaysInline.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/AlwaysInline.java index 9aa8fa67fe44..7c087b3138e3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AlwaysInline.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/AlwaysInline.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java index db20bc6b2feb..b560c7b93a91 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java @@ -36,7 +36,6 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java index a12f2a5a2b61..14f0ccf7d4a8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java @@ -31,7 +31,6 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import jdk.vm.ci.aarch64.AArch64; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java index 77d8ddda7f47..61a17ce90d90 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import java.lang.reflect.Method; @@ -34,10 +34,8 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.StubCallingConvention; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.snippets.KnownIntrinsics; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java index 9db1f983f2ec..2c6e42199ed6 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java @@ -42,7 +42,6 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java index c2bf212c4c8a..607145b96073 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java @@ -32,8 +32,6 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; - public class IsolateListenerSupport { private IsolateListener[] listeners; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java index fc48f2897bc1..529b9cfa160a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java @@ -30,7 +30,6 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.NonmovableArrays; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java index 3da408910d43..72f53837efd2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java @@ -50,7 +50,6 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java index b3c0db715b2c..b276cb6b349b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java @@ -30,7 +30,6 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.hub.LayoutEncoding; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MemoryWalker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MemoryWalker.java index 70180606f8dc..a480231284ed 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MemoryWalker.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MemoryWalker.java @@ -27,7 +27,7 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.heap.ObjectVisitor; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInline.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInline.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInline.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInline.java index d1f53427d686..4646decae57e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInline.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInline.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInlineTrivial.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInlineTrivial.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInlineTrivial.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInlineTrivial.java index ed5e211b2f24..88b523860689 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInlineTrivial.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NeverInlineTrivial.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RegisterDumper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RegisterDumper.java index c9774ee878da..6899b2fd931b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RegisterDumper.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RegisterDumper.java @@ -28,7 +28,6 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java index d0b83fa3ace9..198f22ce7e60 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java @@ -58,8 +58,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java index b9d95ff4ec2c..9bab3f00fba2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.compiler.options.Option; @@ -44,8 +44,7 @@ import com.oracle.svm.core.IsolateListenerSupport.IsolateListener; import com.oracle.svm.core.SubstrateSegfaultHandler.SingleIsolateSegfaultSetup; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java index d81b9092c0df..7f94e2035960 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java @@ -53,7 +53,6 @@ import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.util.VMError; import com.oracle.svm.util.ReflectionUtil; import com.oracle.svm.util.StringUtil; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Uninterruptible.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java similarity index 99% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Uninterruptible.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java index 2cc42fd7af69..a494cd316f2a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Uninterruptible.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/UnmanagedMemoryUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/UnmanagedMemoryUtil.java index f3b53c1750c0..60f2d98f0547 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/UnmanagedMemoryUtil.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/UnmanagedMemoryUtil.java @@ -29,7 +29,6 @@ import org.graalvm.word.WordBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64CPUFeatureAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64CPUFeatureAccess.java index a10c54c762c8..4e001d3266ea 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64CPUFeatureAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64CPUFeatureAccess.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.CPUFeatureAccessImpl; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; import jdk.vm.ci.aarch64.AArch64; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java index bec6537f18c0..c06f9cc1880f 100755 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java @@ -34,7 +34,7 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; @AutomaticFeature @Platforms(Platform.AARCH64.class) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationCounter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationCounter.java index a329da0033dc..893ec0514eb9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationCounter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationCounter.java @@ -29,8 +29,8 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64CPUFeatureAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64CPUFeatureAccess.java index f2a7dbc311b1..99151a9cf242 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64CPUFeatureAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64CPUFeatureAccess.java @@ -37,7 +37,7 @@ import com.oracle.svm.core.ReservedRegisters; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.JVMCISubstitutions; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java index f780799aba05..823e37fb8e3e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; @AutomaticFeature @Platforms(AMD64.class) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AnnotateOriginal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AnnotateOriginal.java deleted file mode 100644 index 991e98ce5024..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AnnotateOriginal.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * This annotation allows to add additional annotations to existing methods but keep the - * implementation as it is. - *

- * The element can also be annotated with {@link TargetElement} to specify additional properties. - * See {@link TargetClass} for an overview of the annotation system. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface AnnotateOriginal { -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AutomaticFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AutomaticFeature.java deleted file mode 100644 index 18fddf07cae2..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AutomaticFeature.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -/** - * Supported API is available to replace this non-API annotation: Instead of using this annotation, - * use {@code "--features "} in the {@code Args} of a - * {@code native-image.properties} file to ensure a user-provided feature gets processed. - * - * Feature classes can use this annotation are unconditionally added when they are reachable on the - * class path. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface AutomaticFeature { -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Delete.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Delete.java deleted file mode 100644 index ee169e7ff883..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Delete.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Mechanism to ensures that an element is not used. - *

- * The element can also be annotated with {@link TargetElement} to specify additional properties. - * See {@link TargetClass} for an overview of the annotation system. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface Delete { - - /** - * Documents the reason why the annotated element is deleted. - */ - String value() default ""; -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Inject.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Inject.java deleted file mode 100644 index 16ca4bc68e9f..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Inject.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -/** - * Injects the annotated field into the {@link TargetClass}. - * - * The field must not be declared static. If instances of the target class are in the image heap, - * the field also needs to be annotated with {@link RecomputeFieldValue} to provide a value for the - * injected field. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface Inject { -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/KeepOriginal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/KeepOriginal.java deleted file mode 100644 index 65e67244bd16..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/KeepOriginal.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -/** - * If a class annotated with {@link TargetClass} is also annotated with {@link Substitute}, all - * non-substituted methods in that class are by default treated as {@link Delete deleted}. This - * annotation changes the behavior: A method annotated with {@link KeepOriginal} keeps the original - * definition of the method. - *

- * If this annotation is used to the {@link Substitute * substituted} type itself, then the original - * definition of all methods and fields in the target type are kept by default. - *

- * The element can also be annotated with {@link TargetElement} to specify additional properties. - * See {@link TargetClass} for an overview of the annotation system. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface KeepOriginal { -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Substitute.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Substitute.java deleted file mode 100644 index 709ef1b24e99..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Substitute.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -/** - * When used to annotate a method, it indicates that a method declaration is intended to be a - * substitute for a method declaration in another class. A substitute method must be declared in a - * class annotated with {@link TargetClass} as the {@link TargetClass#value() value} element of that - * annotation specifies the class containing the method to be substituted (the substitutee - * class). - *

- * The method to be substituted is determined based on a name and a list of parameter types. The - * name is specified by an optional {@link TargetElement#name()} element of this annotation. If this - * element is not specified, then the name of the substitution method is used. The parameter types - * are those of the substitution method. - *

- * There must never be an explicit call to a non-static method annotated with {@link Substitute} - * unless it is from another non-static method in the same class. - *

- * When used to annotate a class, it indicates that the class is intended to be a full substitute - * for the class specified via {@link TargetClass}. All methods in the target class that are not - * substituted in the annotated class are implicitly treated as {@link Delete}d. - *

- * See {@link TargetClass} for an overview of the annotation system. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.FIELD}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface Substitute { - boolean polymorphicSignature() default false; -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetElement.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetElement.java deleted file mode 100644 index 376d738041c9..000000000000 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetElement.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.svm.core.annotate; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.function.BooleanSupplier; -import java.util.function.Predicate; - -/** - * Specifies additional properties for an element also annotated with {@link Alias}, {@link Delete}, - * {@link Substitute}, {@link AnnotateOriginal}, or {@link KeepOriginal}. - *

- * See {@link TargetClass} for an overview of the annotation system. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) -@Platforms(Platform.HOSTED_ONLY.class) -public @interface TargetElement { - - String CONSTRUCTOR_NAME = ""; - - /** - * The name of the field or method in the original class. If the default value is specified for - * this element, then the name of the annotated field or method is used. - *

- * To make a reference to a constructor, use the name {@link #CONSTRUCTOR_NAME}. - */ - String name() default ""; - - /** - * Substitute only if all provided predicates are true (default: unconditional substitution that - * is always included). - * - * The classes must either implement {@link BooleanSupplier} or {@link Predicate}<Class> - * (the parameter for {@link Predicate#test} is the "original" class as specified by the - * {@link TargetClass} annotation, as a {@link Class}). - */ - Class[] onlyWith() default TargetClass.AlwaysIncluded.class; -} diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java index 921f158da57d..d56cd3b58ea2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java @@ -32,7 +32,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.graal.code.CGlobalDataInfo; import com.oracle.svm.core.util.ImageHeapMap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InvokeJavaFunctionPointer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/InvokeJavaFunctionPointer.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InvokeJavaFunctionPointer.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/InvokeJavaFunctionPointer.java index 5a27cccce650..79e53b7e4800 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InvokeJavaFunctionPointer.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/InvokeJavaFunctionPointer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.c; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java index 57c582334568..90f7583a49e9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java @@ -44,7 +44,7 @@ import com.oracle.svm.core.JavaMemoryUtil; import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.heap.ObjectHeader; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/Target_org_graalvm_nativeimage_c_function_CEntryPointLiteral.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/Target_org_graalvm_nativeimage_c_function_CEntryPointLiteral.java index 26ce28cd4e6b..bbfc59fd8bdc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/Target_org_graalvm_nativeimage_c_function_CEntryPointLiteral.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/Target_org_graalvm_nativeimage_c_function_CEntryPointLiteral.java @@ -30,7 +30,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; @TargetClass(CEntryPointLiteral.class) final class Target_org_graalvm_nativeimage_c_function_CEntryPointLiteral { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumRuntimeData.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumRuntimeData.java index 1476ce07e07c..105d125c3aa1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumRuntimeData.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumRuntimeData.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.c.constant.CEnumValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public abstract class EnumRuntimeData { private static final NullPointerException CACHED_NULL_EXCEPTION = new NullPointerException( diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java index 6f7cb68b4134..0caa7344ac70 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.PlatformThreads; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointBuiltins.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointBuiltins.java index 16a2c0cb7209..799e2072b63a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointBuiltins.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointBuiltins.java @@ -37,7 +37,7 @@ import org.graalvm.nativeimage.c.function.CEntryPoint.Publish; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointNativeFunctions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointNativeFunctions.java index d16e58bb8f53..7f319704f24b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointNativeFunctions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointNativeFunctions.java @@ -36,7 +36,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CHeader; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java index cbdd4144be0e..e450a85982e9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java @@ -37,7 +37,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointSetup.EnterIsolatePrologue; import com.oracle.svm.core.c.function.CEntryPointSetup.EnterPrologue; import com.oracle.svm.core.c.function.CEntryPointSetup.LeaveEpilogue; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java index b4096981f309..59d465a4c516 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java index c09927544068..a9d4970d74ee 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java @@ -32,7 +32,7 @@ import org.graalvm.nativeimage.c.function.CFunctionPointer; import com.oracle.svm.core.FunctionPointerHolder; -import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer; +import com.oracle.svm.core.c.InvokeJavaFunctionPointer; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.jdk.InternalVMMethod; import com.oracle.svm.core.snippets.SubstrateForeignCallTarget; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfo.java index ec64eb7e9ad9..c7b4adb9f7ef 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfo.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfo.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.c.struct.RawStructure; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; /** * A tethered {@link CodeInfo} object that can be accessed using the static methods on the class diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java index 7618a9abdaa2..78179c1ff3d4 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.code; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.nativeimage.StackValue; import org.graalvm.nativeimage.c.function.CodePointer; @@ -34,8 +34,8 @@ import com.oracle.svm.core.RuntimeAssertionsSupport; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java index 6234b1b447dc..8f283a6783c9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java @@ -31,8 +31,8 @@ import org.graalvm.compiler.options.Option; import org.graalvm.nativeimage.ImageSingletons; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.ReferenceMapIndex; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.util.Counter; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java index 1814d639d28d..e0f21c6296c3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java @@ -42,7 +42,7 @@ import com.oracle.svm.core.CalleeSavedRegisters; import com.oracle.svm.core.ReservedRegisters; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java index fd3e06607dc3..c350aff4f381 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.c.struct.RawStructure; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableObjectArray; import com.oracle.svm.core.code.InstalledCodeObserver.InstalledCodeObserverHandle; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoQueryResult.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoQueryResult.java index a77091e8fad4..9cbb94329080 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoQueryResult.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoQueryResult.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.CodeReferenceMapDecoder; import com.oracle.svm.core.heap.CodeReferenceMapEncoder; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java index 20bc9fcb50a4..b211c4d86304 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java @@ -36,9 +36,9 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTether.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTether.java index 67df29315ef8..878b083a8381 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTether.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTether.java @@ -25,7 +25,7 @@ package com.oracle.svm.core.code; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.thread.VMOperation; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java index adb7d100ff0a..06e551148e8d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java @@ -27,7 +27,7 @@ import org.graalvm.compiler.graph.NodeSourcePosition; import org.graalvm.nativeimage.c.function.CodePointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java index 17d86f41abda..9064c906788a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java @@ -34,7 +34,7 @@ import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter; import org.graalvm.compiler.graph.NodeSourcePosition; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java index 2d83e2256167..24c88661ff0f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java @@ -32,7 +32,7 @@ import org.graalvm.compiler.core.common.util.TypeReader; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java index 339e196cbb9f..213901472156 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java @@ -48,7 +48,7 @@ import com.oracle.svm.core.CalleeSavedRegisters; import com.oracle.svm.core.ReservedRegisters; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.code.CodeInfoEncoder.Counters; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java index 03b820cb5d73..45caa1f2a1d8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java @@ -34,9 +34,9 @@ import org.graalvm.word.UnsignedWord; import com.oracle.svm.core.MemoryWalker; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java index ddf52a066a30..4bf795eb563d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java @@ -31,7 +31,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.struct.PinnedObjectField; import com.oracle.svm.core.meta.SharedMethod; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java index 0d1db321f1ac..4744dca955b0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java @@ -34,7 +34,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.code.InstalledCodeObserver.InstalledCodeObserverHandle; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstantReferenceAdjuster.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstantReferenceAdjuster.java index 8c3ef86a385d..b5798b40cbbd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstantReferenceAdjuster.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstantReferenceAdjuster.java @@ -27,7 +27,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; import com.oracle.svm.core.meta.DirectSubstrateObjectConstant; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java index 0d5c3aed7108..118cb5795a86 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java @@ -30,7 +30,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; import com.oracle.svm.core.config.ConfigurationValues; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java index f351940c1ab4..761b404a6c7d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java @@ -42,9 +42,9 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java index 30c77f5c590a..148dd3472053 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java @@ -36,8 +36,8 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java index db4446b4cedb..5b849f06dc7e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.code; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfoAccess.HasInstalledCode; import com.oracle.svm.core.deopt.SubstrateInstalledCode; import com.oracle.svm.core.thread.Safepoint; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java index 712f0aa5f160..3529dd3e1665 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java @@ -35,7 +35,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.code.CodeInfoAccess.HasInstalledCode; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/UntetheredCodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/UntetheredCodeInfoAccess.java index 62a767fc878a..2eac5490de68 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/UntetheredCodeInfoAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/UntetheredCodeInfoAccess.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.deopt.SubstrateInstalledCode; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java index edf1661e8b1e..73cd0f7db9c8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java @@ -31,7 +31,7 @@ import org.graalvm.word.WordBase; import com.oracle.svm.core.SubstrateTargetDescription; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.deopt.DeoptimizedFrame; import jdk.vm.ci.code.CodeUtil; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DeoptTest.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptTest.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DeoptTest.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptTest.java index 616702ebf08c..d45fd1ec5f9c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DeoptTest.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; +package com.oracle.svm.core.deopt; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + /** * Used to test deoptimization. Annotated methods are compiled in two versions: a regular version * and a version which is used as deoptimization target. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java index d0d4507e3006..8a15041807d2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java @@ -32,7 +32,7 @@ import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.code.DeoptimizationSourcePositionDecoder; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java index b78bb32aef0c..7cdde42a9491 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java @@ -30,8 +30,8 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.nativeimage.c.function.CFunctionPointer; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownPrimitiveField; public class DeoptimizationSupport { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizedFrame.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizedFrame.java index 0c147ea799b7..4b0f6dd6f682 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizedFrame.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizedFrame.java @@ -38,7 +38,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoQueryResult; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java index 6661475daf17..7b1244fbd9a7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java @@ -49,9 +49,8 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.ReservedRegisters; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Specialize; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoQueryResult; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Specialize.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Specialize.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Specialize.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Specialize.java index f3eb5cbf7956..152949c233b2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Specialize.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Specialize.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; - -import org.graalvm.nativeimage.Platform; -import org.graalvm.nativeimage.Platforms; +package com.oracle.svm.core.deopt; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.graalvm.nativeimage.Platform; +import org.graalvm.nativeimage.Platforms; + /** * Used to test specialization and deoptimization. This annotation works in conjunction with * {@link DeoptTest}. The purpose of these annotations is to test specialization and deoptimization diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java index d9d9689da28f..b2a80cf3d824 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.deopt; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import org.graalvm.compiler.core.common.CompilationIdentifier; import com.oracle.svm.core.code.CodeInfo; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExplicitCallingConvention.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/ExplicitCallingConvention.java similarity index 93% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExplicitCallingConvention.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/ExplicitCallingConvention.java index aac6090d5cf0..48ef71a6c18f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExplicitCallingConvention.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/ExplicitCallingConvention.java @@ -22,15 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.graal.code; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind; - /** * Annotation that overrides the default calling convention used for a method. */ diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/StubCallingConvention.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/StubCallingConvention.java index 742d1423a662..0f33f8e1d0bd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/StubCallingConvention.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.graal.code; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -31,11 +31,11 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.util.GuardedAnnotationAccess; import com.oracle.svm.core.CalleeSavedRegisters; import com.oracle.svm.core.snippets.SubstrateForeignCallTarget; import com.oracle.svm.core.util.UserError; +import com.oracle.svm.util.GuardedAnnotationAccess; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java index b0a5575e59f9..d9fbcb54ed69 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java @@ -27,7 +27,7 @@ import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.meta.SharedMethod; import com.oracle.svm.core.meta.SharedType; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java index cd76c27a7ac1..22de0cd6e4b3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java @@ -31,13 +31,15 @@ import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.java.AbstractNewArrayNode; +import com.oracle.svm.core.hub.Hybrid; + import jdk.vm.ci.meta.ResolvedJavaType; /** * The {@link SubstrateNewHybridInstanceNode} represents the allocation of an instance class object * with a hybrid layout. * - * @see com.oracle.svm.core.annotate.Hybrid + * @see Hybrid */ @NodeInfo(nameTemplate = "NewHybridInstance {p#instanceClass/s}") public final class SubstrateNewHybridInstanceNode extends AbstractNewArrayNode { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java index 02c298be4409..682f15968f00 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java @@ -33,7 +33,7 @@ import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer; import com.oracle.svm.util.DirectAnnotationAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.code.SubstrateBackend; import com.oracle.svm.core.meta.SharedMethod; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java index 6777702949ec..73905e873c01 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java @@ -26,7 +26,7 @@ import static com.oracle.svm.core.SubstrateOptions.MultiThreaded; import static com.oracle.svm.core.SubstrateOptions.SpawnIsolates; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import static com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode.writeCurrentVMThread; import static com.oracle.svm.core.graal.nodes.WriteHeapBaseNode.writeCurrentVMHeapBase; import static com.oracle.svm.core.util.VMError.shouldNotReachHere; @@ -72,8 +72,8 @@ import com.oracle.svm.core.RuntimeAssertionsSupport; import com.oracle.svm.core.SubstrateDiagnostics; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java index 79caf1eeb439..fdb2fd0201cc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java @@ -33,9 +33,9 @@ import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.deopt.DeoptimizationSupport; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java index fe939cdea5d5..06d5ebaf134a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java @@ -47,7 +47,7 @@ import org.graalvm.compiler.replacements.Snippets; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode; import com.oracle.svm.core.meta.SharedMethod; import com.oracle.svm.core.snippets.ExceptionUnwind; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java index b662e9e8a6b8..3a0cfaecd5ce 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java @@ -81,7 +81,7 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.graal.code.SubstrateBackend; import com.oracle.svm.core.graal.meta.KnownOffsets; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java index d5f2b07f75bd..d9ccac4e0a99 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java @@ -50,7 +50,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.InternalFeature; import com.oracle.svm.core.graal.meta.RuntimeConfiguration; import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java index 22fa5b8cc956..c88408dc1703 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java @@ -68,9 +68,9 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.graal.InternalFeature; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java index 7abf3796a6d9..afac3b4b0589 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java @@ -48,7 +48,7 @@ import org.graalvm.compiler.replacements.SnippetTemplate; import org.graalvm.compiler.replacements.Snippets; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.graal.meta.KnownOffsets; import com.oracle.svm.core.graal.word.DynamicHubAccess; import com.oracle.svm.core.hub.DynamicHub; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java index 8748b0b2482b..86fa21237fa9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java @@ -45,7 +45,7 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.InternalFeature; import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider; import com.oracle.svm.core.graal.snippets.ArithmeticSnippets; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/handles/ThreadLocalHandles.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/handles/ThreadLocalHandles.java index 0086739ac49c..b4711fe8ae85 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/handles/ThreadLocalHandles.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/handles/ThreadLocalHandles.java @@ -30,8 +30,8 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; /** * Implementation of local object handles, which are bound to a specific thread and can be created diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java index 989f850228b0..8702d8fcf893 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java @@ -32,7 +32,7 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public class LibC { public static final int EXIT_CODE_ABORT = 99; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibCSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibCSupport.java index 50ae8f4705dd..d7c252b53767 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibCSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibCSupport.java @@ -30,7 +30,7 @@ import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public interface LibCSupport { @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/AbstractMemoryMXBean.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/AbstractMemoryMXBean.java index b9150c8f1428..eca682c9d79f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/AbstractMemoryMXBean.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/AbstractMemoryMXBean.java @@ -40,7 +40,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateGCOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.RuntimeCodeCache.CodeInfoVisitor; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java index 7fa20dc5ff35..e8df6667ddf6 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java @@ -32,9 +32,9 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.util.NonmovableByteArrayReader; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExcludeFromReferenceMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ExcludeFromReferenceMap.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExcludeFromReferenceMap.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ExcludeFromReferenceMap.java index 45ee23901502..1de4a9c0f5d8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExcludeFromReferenceMap.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ExcludeFromReferenceMap.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.heap; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java index 5bb9c0e19268..6eb36dc2244f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java @@ -31,8 +31,8 @@ import org.graalvm.nativeimage.hosted.Feature; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java index fd5a960b0a51..aa6bdbc111be 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java @@ -37,7 +37,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.PredefinedClassesSupport; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java index 94bc7538d60c..c203d92c0fe2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java @@ -28,8 +28,8 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.util.NonmovableByteArrayReader; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java index cc558b6f1cd5..f5a4bb7aa6b5 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java @@ -24,8 +24,8 @@ */ package com.oracle.svm.core.heap; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; import com.oracle.svm.core.threadlocal.FastThreadLocalObject; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java index 5b9553b4e68e..cce77abf9fa7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java @@ -31,7 +31,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.image.ImageHeapObject; import com.oracle.svm.core.snippets.KnownIntrinsics; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectReferenceVisitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectReferenceVisitor.java index 8020a3841444..f51f41d7a382 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectReferenceVisitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectReferenceVisitor.java @@ -26,8 +26,7 @@ import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.util.VMError; /** Visitor for object references. */ diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectVisitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectVisitor.java index 24781e4ebe46..ac706669506e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectVisitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectVisitor.java @@ -24,8 +24,6 @@ */ package com.oracle.svm.core.heap; -import com.oracle.svm.core.annotate.RestrictHeapAccess; - /** * Supply a closure to be applied to Objects. * diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/OutOfMemoryUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/OutOfMemoryUtil.java index befb4dff5e4e..86fb9c99d2d3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/OutOfMemoryUtil.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/OutOfMemoryUtil.java @@ -25,7 +25,6 @@ package com.oracle.svm.core.heap; import com.oracle.svm.core.SubstrateGCOptions; -import com.oracle.svm.core.annotate.RestrictHeapAccess; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.jdk.JDKUtils; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java index 4e93b7729dd6..23c995736a96 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java @@ -29,7 +29,6 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.Containers; -import com.oracle.svm.core.annotate.RestrictHeapAccess; import com.oracle.svm.core.graal.snippets.CEntryPointSnippets; import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicInteger; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java index dc4385298bde..bd10eb301a5a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java @@ -24,7 +24,6 @@ */ package com.oracle.svm.core.heap; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; import org.graalvm.compiler.api.directives.GraalDirectives; import org.graalvm.compiler.nodes.java.ArrayLengthNode; import org.graalvm.compiler.word.BarrieredAccess; @@ -33,12 +32,13 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.JavaMemoryUtil; -import com.oracle.svm.core.annotate.AlwaysInline; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.graal.nodes.NewPodInstanceNode; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.LayoutEncoding; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.util.UnsignedUtils; public final class PodReferenceMapDecoder { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java index 0fc893aedb05..473e7a7fb13b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java @@ -36,9 +36,9 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; public final class ReferenceAccessImpl implements ReferenceAccess { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java index fb4e0452d7bd..3c8b30b10501 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java @@ -39,7 +39,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.VMOperation; import com.oracle.svm.core.util.TimeUtils; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RestrictHeapAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccess.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RestrictHeapAccess.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccess.java index b885e493eba1..a5f8b6b72716 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RestrictHeapAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccess.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.heap; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccessCallees.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccessCallees.java index f5fe75d2563f..dccb5da109a9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccessCallees.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RestrictHeapAccessCallees.java @@ -27,8 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RuntimeCodeInfoGCSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RuntimeCodeInfoGCSupport.java index 377e49199b09..5f2198e1e5c7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RuntimeCodeInfoGCSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/RuntimeCodeInfoGCSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.heap; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; public abstract class RuntimeCodeInfoGCSupport { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java index d9475bc08fb3..c804805e5d86 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java @@ -24,11 +24,10 @@ */ package com.oracle.svm.core.heap; +import com.oracle.svm.core.hub.Hybrid; import org.graalvm.compiler.word.Word; import org.graalvm.nativeimage.c.function.CodePointer; -import com.oracle.svm.core.annotate.Hybrid; - /** Execution state of a continuation, use via {@link StoredContinuationAccess}. */ @Hybrid(componentType = Word.class) public final class StoredContinuation { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java index 64204df10e00..fa9b6ef89bb9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java @@ -40,8 +40,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java index a093090338d6..de86cf928f8c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java @@ -38,15 +38,13 @@ import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Delete; -import com.oracle.svm.core.annotate.ExcludeFromReferenceMap; import com.oracle.svm.core.annotate.Inject; import com.oracle.svm.core.annotate.KeepOriginal; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownClass; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.JDK17OrLater; import com.oracle.svm.core.jdk.JDK17_0_2OrLater; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownClass.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownClass.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownClass.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownClass.java index 6c526ec5c4fe..8841040da192 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownClass.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownClass.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.heap; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownObjectField.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownObjectField.java similarity index 98% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownObjectField.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownObjectField.java index 808a248410fe..ff87c283d787 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownObjectField.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownObjectField.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.heap; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownPrimitiveField.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownPrimitiveField.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownPrimitiveField.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownPrimitiveField.java index 6e4c2f63b822..727e21981938 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/UnknownPrimitiveField.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/UnknownPrimitiveField.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.heap; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfo.java index 205696fb9216..5da1f4128f6c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfo.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfo.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.heap; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.VMOperation; import com.oracle.svm.core.thread.VMOperation.SystemEffect; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java index 4e98af982996..457c5cdc0e23 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java @@ -36,7 +36,6 @@ import org.graalvm.nativeimage.hosted.Feature; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.UnknownObjectField; import com.oracle.svm.core.thread.VMOperation.SystemEffect; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java index 4e3955276d7c..81c29f51c1cb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java @@ -41,9 +41,9 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoTable; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java index 3ba8d5a3f1af..222bf3e6e3a9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java @@ -66,17 +66,16 @@ import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Delete; -import com.oracle.svm.core.annotate.Hybrid; import com.oracle.svm.core.annotate.InjectAccessors; import com.oracle.svm.core.annotate.KeepOriginal; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.classinitialization.ClassInitializationInfo; import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.jdk.JDK11OrEarlier; import com.oracle.svm.core.jdk.JDK17OrLater; import com.oracle.svm.core.jdk.JDK19OrLater; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java index b50d86a7f23a..ade28a12438f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java @@ -30,8 +30,8 @@ import org.graalvm.nativeimage.hosted.Feature; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/HubType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/HubType.java index d28fdab9c1a3..cae858082390 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/HubType.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/HubType.java @@ -24,8 +24,8 @@ */ package com.oracle.svm.core.hub; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.Uninterruptible; @DuplicatedInNativeCode public class HubType { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Hybrid.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/Hybrid.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Hybrid.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/Hybrid.java index 6d7c6c6c5913..5ba011451d5e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Hybrid.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/Hybrid.java @@ -22,16 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.hub; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.oracle.svm.core.hub.HubType; -import com.oracle.svm.core.hub.LayoutEncoding; - /** * Defines that the annotated class should have a Hybrid layout. Hybrid layouts are hybrids between * instance layouts and array layouts. The contents of a specified member array and (optional) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java index b995152859b4..a377bca5c2ce 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java @@ -29,8 +29,8 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.heap.InstanceReferenceMapDecoder; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java index 1a73be6c8d1d..eb866e0f3847 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java @@ -35,12 +35,11 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Hybrid; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ObjectLayout; import com.oracle.svm.core.snippets.KnownIntrinsics; +import com.oracle.svm.core.util.DuplicatedInNativeCode; import com.oracle.svm.core.util.VMError; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java index 97854276d4b1..160206b488fd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java @@ -26,7 +26,7 @@ import org.graalvm.compiler.core.common.NumUtil; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; @DuplicatedInNativeCode public enum ReferenceType { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/invoke/MethodHandleUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/invoke/MethodHandleUtils.java index 7adac691262f..797512459dbe 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/invoke/MethodHandleUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/invoke/MethodHandleUtils.java @@ -28,7 +28,7 @@ import java.lang.invoke.MethodHandle; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import sun.invoke.util.Wrapper; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/AbstractUninterruptibleHashtable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/AbstractUninterruptibleHashtable.java index ffd5c0f8eadb..1d1f0dc892d1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/AbstractUninterruptibleHashtable.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/AbstractUninterruptibleHashtable.java @@ -33,7 +33,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * An uninterruptible hashtable with a fixed size that uses chaining in case of a collision. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java index ef5f7aded70e..ef634c85a31a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java @@ -59,12 +59,12 @@ import com.oracle.svm.core.annotate.AnnotateOriginal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.KeepOriginal; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.hub.ClassForNameSupport; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.jdk.JavaLangSubstitutions.ClassValueSupport; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java index 12ea40aa8b64..5627b2cc61bc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java @@ -55,7 +55,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.InjectAccessors; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java index 7b67f977b8b5..5e290663db33 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java @@ -37,7 +37,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.code.FrameInfoQueryResult; import com.oracle.svm.core.heap.VMOperationInfos; import com.oracle.svm.core.snippets.KnownIntrinsics; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StringInternSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StringInternSupport.java index 62cf92b31b61..9b7e9946b660 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StringInternSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StringInternSupport.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownObjectField; public final class StringInternSupport { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java index b5aef82293b3..00e7397e3c2f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java @@ -39,7 +39,7 @@ import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.LayoutEncoding; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_StackWalker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_StackWalker.java index 850742ea25dd..86d2d061eb8e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_StackWalker.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_StackWalker.java @@ -43,11 +43,11 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Delete; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoTable; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java index e62b6ac6e336..0b126f8d47d2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java @@ -33,12 +33,12 @@ import com.oracle.svm.core.annotate.AnnotateOriginal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.InjectAccessors; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.snippets.KnownIntrinsics; import jdk.internal.misc.Unsafe; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java index 6b739519f454..ca20fd16c6c7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jdk; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.hub.DynamicHub; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleHashtable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleHashtable.java index 6301efce05af..c20cc8ec0b22 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleHashtable.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleHashtable.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jdk; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Common interface for all uninterruptible hashtable implementations. Please note that we don't use diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleUtils.java index 1d5d587c4dad..71d777660be0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/UninterruptibleUtils.java @@ -31,7 +31,7 @@ import org.graalvm.word.WordBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; import jdk.internal.misc.Unsafe; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java index 2a9732d7a478..9375f69112a7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jdk; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import org.graalvm.compiler.nodes.UnreachableNode; import org.graalvm.nativeimage.ImageSingletons; @@ -32,11 +32,11 @@ import org.graalvm.nativeimage.c.function.CodePointer; import com.oracle.svm.core.SubstrateDiagnostics; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.snippets.KnownIntrinsics; import com.oracle.svm.core.stack.StackOverflowCheck; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/LibManagementExtSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/LibManagementExtSupport.java index fe4cd58dc5b2..9e5462bde5b1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/LibManagementExtSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/LibManagementExtSupport.java @@ -38,7 +38,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointOptions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java index d6de16d1bd68..2b25fa461d9e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java @@ -53,7 +53,7 @@ import org.graalvm.nativeimage.impl.InternalPlatform; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadListener; import com.oracle.svm.core.util.UserError; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateThreadMXBean.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateThreadMXBean.java index 3d2c70df2559..32715360ed76 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateThreadMXBean.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateThreadMXBean.java @@ -36,7 +36,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicInteger; import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicLong; import com.oracle.svm.core.thread.PlatformThreads; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java index d8d7a8fe8f1f..4a7876fcd088 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java @@ -33,7 +33,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.util.UnsignedUtils; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java index 6b2c77238b60..aa9a8e2e80a3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java @@ -37,7 +37,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.os.RawFileOperationSupport; import com.oracle.svm.core.thread.JavaVMOperation; import com.oracle.svm.core.thread.VMOperation; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrConstantPool.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrConstantPool.java index dae1371eb83b..476a7d91d206 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrConstantPool.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrConstantPool.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jfr; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Epoch-based storage for metadata. Switching the epoch and iterating the collected data may only diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java index 8a11b2c33a73..e50e6ccf95fb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEvent.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * The event IDs depend on the metadata.xml and therefore vary between JDK versions. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEventWriterAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEventWriterAccess.java index 652528f09eca..ea2cef42ccbb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEventWriterAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrEventWriterAccess.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.util.ReflectionUtil; import jdk.internal.misc.Unsafe; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFeature.java index 601c9e08c8d7..5fb69e665186 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFeature.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFeature.java @@ -35,7 +35,7 @@ import com.oracle.svm.core.VMInspectionOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.RuntimeSupport; import com.oracle.svm.core.jfr.traceid.JfrTraceIdEpoch; import com.oracle.svm.core.jfr.traceid.JfrTraceIdMap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFrameType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFrameType.java index d72a89bef8ba..f6e739a62f57 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFrameType.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrFrameType.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * List the different types of stack frames that can be part of a stack trace. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCName.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCName.java index da5e3b45de18..0d077f60bcf4 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCName.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCName.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public class JfrGCName { private final int id; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGlobalMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGlobalMemory.java index f92aec099744..8acc38045923 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGlobalMemory.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGlobalMemory.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Manages the global JFR memory. A lot of the methods must be uninterruptible to ensure that we can diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventSetting.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventSetting.java index 7db48d1c71d8..e9913f2f5393 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventSetting.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventSetting.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jfr; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriter.java index d4d3cfa42c43..cb47d42e1151 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriter.java @@ -31,8 +31,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriterDataAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriterDataAccess.java index 4f886d446ce7..42b7a74d65ea 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriterDataAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrNativeEventWriterDataAccess.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jfr; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Helper class that holds methods related to {@link JfrNativeEventWriterData}. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java index 53e2981f7151..142ce7888ecb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java @@ -27,7 +27,7 @@ import org.graalvm.compiler.core.common.SuppressFBWarnings; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.locks.VMCondition; import com.oracle.svm.core.locks.VMMutex; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrStackTraceRepository.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrStackTraceRepository.java index 42173c5679c2..f8a225bf2533 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrStackTraceRepository.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrStackTraceRepository.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Repository that collects all metadata about stacktraces. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java index 82cbd3eddd9b..17259b3cfd99 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java @@ -35,7 +35,7 @@ import org.graalvm.nativeimage.c.struct.RawStructure; import org.graalvm.nativeimage.c.struct.SizeOf; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.struct.PinnedObjectField; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jdk.AbstractUninterruptibleHashtable; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java index c0dd3488ebc1..ea96050f94bd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java @@ -34,7 +34,7 @@ import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.events.ExecutionSampleEvent; import com.oracle.svm.core.jfr.events.ThreadEndEvent; import com.oracle.svm.core.jfr.events.ThreadStartEvent; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadRepository.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadRepository.java index 5bc269179794..c36f18c944ba 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadRepository.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadRepository.java @@ -33,7 +33,7 @@ import org.graalvm.nativeimage.c.struct.SizeOf; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.AbstractUninterruptibleHashtable; import com.oracle.svm.core.jdk.UninterruptibleEntry; import com.oracle.svm.core.jfr.traceid.JfrTraceIdEpoch; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadState.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadState.java index cd38d50169de..243d6641691d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadState.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadState.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTicks.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTicks.java index d32741ab963b..4f016e39139d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTicks.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTicks.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jfr; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import java.util.concurrent.TimeUnit; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTypeRepository.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTypeRepository.java index b68f73f4ef83..f9af125ba8b9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTypeRepository.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTypeRepository.java @@ -35,7 +35,7 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.GCCause; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jfr.traceid.JfrTraceId; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java index 6677b28c396e..e8fbb71a155d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java @@ -36,7 +36,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.VMOperationInfos; import com.oracle.svm.core.jfr.events.ExecutionSampleEvent; import com.oracle.svm.core.jfr.logging.JfrLogging; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EndChunkNativePeriodicEvents.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EndChunkNativePeriodicEvents.java index cb02c9f26651..861c745451a1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EndChunkNativePeriodicEvents.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EndChunkNativePeriodicEvents.java @@ -30,7 +30,7 @@ import com.oracle.svm.core.jfr.JfrEventWriteStatus; import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EveryChunkNativePeriodicEvents.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EveryChunkNativePeriodicEvents.java index 1b1635a8743c..8d0384a3809f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EveryChunkNativePeriodicEvents.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EveryChunkNativePeriodicEvents.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecuteVMOperationEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecuteVMOperationEvent.java index 14e6aaaa6d54..decbfb57af3c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecuteVMOperationEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecuteVMOperationEvent.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.IsolateThread; import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.HasJfrSupport; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecutionSampleEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecutionSampleEvent.java index 1f914beaacd4..1267e822d17f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecutionSampleEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ExecutionSampleEvent.java @@ -33,7 +33,7 @@ import org.graalvm.nativeimage.Threading; import org.graalvm.nativeimage.impl.ThreadingSupport; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JVMInformation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JVMInformation.java index 3b3aa3ddfacd..5a43c19e459c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JVMInformation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JVMInformation.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.ImageSingletons; import com.oracle.svm.core.JavaMainWrapper; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public class JVMInformation { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java index 393509205d52..b2a20731fe80 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java @@ -29,7 +29,7 @@ import com.oracle.svm.core.jfr.HasJfrSupport; import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java index 7d4a83d3813f..6d95c2ed6abd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java @@ -26,7 +26,7 @@ package com.oracle.svm.core.jfr.events; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointBeginEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointBeginEvent.java index 01adaf3bf767..34b359c6837e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointBeginEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointBeginEvent.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.StackValue; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.HasJfrSupport; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointEndEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointEndEvent.java index 43dc9a268164..04ab808d39db 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointEndEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/SafepointEndEvent.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.StackValue; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.HasJfrSupport; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadEndEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadEndEvent.java index c69f2400b61b..7f8bd13eee94 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadEndEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadEndEvent.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.IsolateThread; import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadSleepEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadSleepEvent.java index e927dd0744a4..2c779b5db58a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadSleepEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadSleepEvent.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java index 2445bce518f4..462de3d381e9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadStartEvent.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.IsolateThread; import org.graalvm.nativeimage.StackValue; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrEvent; import com.oracle.svm.core.jfr.JfrNativeEventWriter; import com.oracle.svm.core.jfr.JfrNativeEventWriterData; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceId.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceId.java index f3b9db914bd0..7e39e07f4a23 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceId.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceId.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import jdk.jfr.internal.Type; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java index 60ef4709daed..3bd5c9eb51b9 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.VMOperation; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java index 77704ad18eed..495c69be5623 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java @@ -33,8 +33,8 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.hub.DynamicHub; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIGeneratedMethodSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIGeneratedMethodSupport.java index 0b3ed518a951..e796adfa1a09 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIGeneratedMethodSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIGeneratedMethodSupport.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.StaticFieldsSupport; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.jni.access.JNIAccessibleField; import com.oracle.svm.core.jni.access.JNINativeLinkage; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java index e697af1a9d15..7d086d260f71 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java @@ -37,7 +37,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.jni.headers.JNIJavaVM; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java index f1f378b292b6..67d27aa282df 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java @@ -38,8 +38,8 @@ import com.oracle.svm.core.Isolates; import com.oracle.svm.core.RuntimeAssertionsSupport; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.handles.ObjectHandlesImpl; import com.oracle.svm.core.handles.ThreadLocalHandles; import com.oracle.svm.core.heap.Heap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIThreadLocalPendingException.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIThreadLocalPendingException.java index c4d4abcb6d4f..af76ca09dedc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIThreadLocalPendingException.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIThreadLocalPendingException.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jni; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; import com.oracle.svm.core.threadlocal.FastThreadLocalObject; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java index 03d0355031f4..83f7bce464fa 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleField.java @@ -34,7 +34,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.StaticFieldsSupport; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jni.headers.JNIFieldId; import jdk.vm.ci.meta.JavaKind; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMember.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMember.java index 1a8753118a19..cbec71c6da28 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMember.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMember.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownObjectField; abstract class JNIAccessibleMember { private final JNIAccessibleClass declaringClass; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java index 1c1c2feb7ccc..51bbc51cae52 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java @@ -34,8 +34,8 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jni.CallVariant; import com.oracle.svm.core.util.VMError; import com.oracle.svm.util.ReflectionUtil; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java index 823eceaa2ac0..461c5a122b85 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java @@ -46,7 +46,7 @@ import com.oracle.svm.core.Isolates; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jni.headers.JNIFieldId; import com.oracle.svm.core.jni.headers.JNIMethodId; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java index 80cce865de98..8a2778c8b2ce 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jni.functions; -import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION; +import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION; import java.lang.reflect.Array; import java.lang.reflect.Constructor; @@ -57,10 +57,10 @@ import com.oracle.svm.core.SubstrateDiagnostics; import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java index c4022ca018cd..f4ec648a3c6a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java @@ -43,7 +43,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java index 5e3854519e71..c67de1c54ecf 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.c.CContext; import org.graalvm.nativeimage.c.constant.CConstant; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; @CContext(JNIHeaderDirectives.class) public final class JNIVersion { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfLongVariant.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfLongVariant.java index 0c1b42e817e7..3fe025ed77e6 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfLongVariant.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfLongVariant.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.jvmstat; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java index e9ac4372904a..b0f76e89f7b3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java @@ -29,9 +29,6 @@ import java.util.ArrayList; -import com.oracle.svm.core.VMInspectionOptions; -import com.oracle.svm.core.jdk.RuntimeSupport; -import com.oracle.svm.core.option.HostedOptionKey; import org.graalvm.collections.EconomicMap; import org.graalvm.compiler.options.Option; import org.graalvm.compiler.word.Word; @@ -43,9 +40,12 @@ import com.oracle.svm.core.IsolateArgumentParser; import com.oracle.svm.core.SubstrateOptions; +import com.oracle.svm.core.VMInspectionOptions; import com.oracle.svm.core.heap.Heap; +import com.oracle.svm.core.jdk.RuntimeSupport; import com.oracle.svm.core.locks.VMCondition; import com.oracle.svm.core.locks.VMMutex; +import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.option.RuntimeOptionKey; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java index d444c55db5f3..ba2e8eaf5f59 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java @@ -24,6 +24,8 @@ */ package com.oracle.svm.core.jvmstat; +import static com.oracle.svm.core.jvmstat.PerfManager.Options.PerfDataMemoryMappedFile; + import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -37,15 +39,13 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.jdk.Target_java_nio_Buffer; import com.oracle.svm.core.jdk.Target_java_nio_DirectByteBuffer; -import static com.oracle.svm.core.jvmstat.PerfManager.Options.PerfDataMemoryMappedFile; - /** * Provides access to the underlying OS-specific memory that stores the performance data. * diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/SystemCounters.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/SystemCounters.java index 5e1d934e581b..42aa63951821 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/SystemCounters.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/SystemCounters.java @@ -28,7 +28,7 @@ import java.lang.management.ThreadMXBean; import java.util.concurrent.TimeUnit; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.VMOperation; import com.oracle.svm.core.thread.VMOperationListener; import org.graalvm.nativeimage.ImageSingletons; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/SingleThreadedVMLockSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/SingleThreadedVMLockSupport.java index 53fa3c21af15..d6ef59c310e7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/SingleThreadedVMLockSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/SingleThreadedVMLockSupport.java @@ -31,7 +31,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMCondition.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMCondition.java index 91e89bffef66..c77d7c881abf 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMCondition.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMCondition.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMLockSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMLockSupport.java index 84a126c6d523..0c8e4fb27b37 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMLockSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMLockSupport.java @@ -29,7 +29,7 @@ import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunk; import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.log.Log; public abstract class VMLockSupport { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMMutex.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMMutex.java index 5a4789859ccb..29a382fe896e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMMutex.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/locks/VMMutex.java @@ -31,7 +31,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/FunctionPointerLogHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/FunctionPointerLogHandler.java index d933f74ea5f8..9ff2f2ac2e6b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/FunctionPointerLogHandler.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/FunctionPointerLogHandler.java @@ -24,8 +24,8 @@ */ package com.oracle.svm.core.log; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.headers.LibC; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RawBufferLog.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RawBufferLog.java index 122049cbd19c..f40e49e7b87c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RawBufferLog.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RawBufferLog.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; public class RawBufferLog extends RealLog { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java index 4d1db476ac28..820d722bf1f6 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java @@ -40,8 +40,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jdk.JDKUtils; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/StringBuilderLog.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/StringBuilderLog.java index 58d645e79ed3..cca379cdafe0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/StringBuilderLog.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/StringBuilderLog.java @@ -28,8 +28,8 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; public class StringBuilderLog extends RealLog { private final StringBuilder stringBuilder = new StringBuilder(); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/DirectSubstrateObjectConstant.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/DirectSubstrateObjectConstant.java index 42f96141f771..8faf816ec642 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/DirectSubstrateObjectConstant.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/DirectSubstrateObjectConstant.java @@ -25,7 +25,7 @@ package com.oracle.svm.core.meta; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SharedMethod.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SharedMethod.java index 254093bf1719..4a4e7a639900 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SharedMethod.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SharedMethod.java @@ -24,8 +24,8 @@ */ package com.oracle.svm.core.meta; -import com.oracle.svm.core.annotate.ExplicitCallingConvention; import com.oracle.svm.core.deopt.Deoptimizer; +import com.oracle.svm.core.graal.code.ExplicitCallingConvention; import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java index 473f6a303459..6a51765ddbcf 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.CurrentIsolate; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrTicks; import com.oracle.svm.core.jfr.SubstrateJVM; import com.oracle.svm.core.jfr.events.JavaMonitorEnterEvent; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitorQueuedSynchronizer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitorQueuedSynchronizer.java index 732dfe010c5d..0ebf3953d108 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitorQueuedSynchronizer.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitorQueuedSynchronizer.java @@ -34,7 +34,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.JfrTicks; import com.oracle.svm.core.jfr.SubstrateJVM; import com.oracle.svm.core.jfr.events.JavaMonitorWaitEvent; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java index 129f0fe73d75..23444cb249e7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java @@ -27,7 +27,7 @@ import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.nativeimage.ImageSingletons; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadStatus; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java index 07c64cadd901..ab772e1625cd 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java @@ -41,10 +41,10 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.WeakIdentityHashMap; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.DynamicHubCompanion; import com.oracle.svm.core.jdk.JDK17OrEarlier; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/SingleThreadedMonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/SingleThreadedMonitorSupport.java index 3d83391004b0..7ada4e90ac9f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/SingleThreadedMonitorSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/SingleThreadedMonitorSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.monitor; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.ThreadStatus; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java index 1d33fc612c7e..5e11751440dc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java @@ -48,7 +48,7 @@ import com.oracle.svm.core.annotate.AnnotateOriginal; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.util.VMError; import com.oracle.svm.util.ClassUtil; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java index a58305a238b5..f381b6ed1b4d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java @@ -39,7 +39,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.code.RuntimeCodeCache; import com.oracle.svm.core.heap.Heap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java index 294b59b05c26..dad0468e369b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java @@ -36,7 +36,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.os.VirtualMemoryProvider.Access; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java index 961be3df864a..27f18ac53589 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java @@ -30,7 +30,7 @@ import org.graalvm.compiler.word.Word; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; public abstract class AbstractImageHeapProvider implements ImageHeapProvider { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java index f06cb06b95f0..9145879b9976 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java @@ -36,7 +36,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.hub.LayoutEncoding; import com.oracle.svm.core.snippets.KnownIntrinsics; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java index ca57c1efe8c1..c5762950451c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java @@ -34,7 +34,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; import com.oracle.svm.core.heap.Heap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CopyingImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CopyingImageHeapProvider.java index 4dde234895f8..966f9a63c0f0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CopyingImageHeapProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CopyingImageHeapProvider.java @@ -28,7 +28,7 @@ import org.graalvm.word.UnsignedWord; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointErrors; /** Platform independent image heap provider that deep-copies the image heap memory. */ diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java index 080ca4ae3839..cda808ba28d3 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java @@ -38,7 +38,7 @@ import com.oracle.svm.core.Isolates; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.c.function.CEntryPointSetup; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java index 08f6d55f0fa0..96e092db6906 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java @@ -32,7 +32,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.os.AbstractRawFileOperationSupport.RawFileOperationSupportHolder; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/ReflectionAccessorHolder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/ReflectionAccessorHolder.java index f6a0ad2c4104..4c27787ed7b8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/ReflectionAccessorHolder.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/ReflectionAccessorHolder.java @@ -28,8 +28,8 @@ import org.graalvm.nativeimage.c.function.CFunctionPointer; -import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.c.InvokeJavaFunctionPointer; import com.oracle.svm.core.jdk.InternalVMMethod; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataEncoding.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataEncoding.java index 0b0ef630ef38..bbb4d56ffb5c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataEncoding.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataEncoding.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownObjectField; public class ReflectionMetadataEncoding { @UnknownObjectField(types = {byte[].class}) private byte[] encoding; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java index 2a69c6d2311a..f63a254bcbd0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java @@ -31,7 +31,7 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.RuntimeAnalysisWorkarounds; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.snippets.KnownIntrinsics; import com.oracle.svm.core.stack.JavaStackWalker; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java index f8021d4ee885..6f504541e57e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java @@ -33,7 +33,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.util.UnsignedUtils; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferPool.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferPool.java index 96af063d0e6b..a7ff8928b420 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferPool.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferPool.java @@ -27,7 +27,7 @@ import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.locks.VMMutex; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferStack.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferStack.java index 229e942b6892..f3548df312c6 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferStack.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferStack.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * The linked-list implementation of the stack that holds a sequence of native memory buffers. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerIsolateLocal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerIsolateLocal.java index 2f69970f2372..6b47198225f2 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerIsolateLocal.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerIsolateLocal.java @@ -34,7 +34,7 @@ import com.oracle.svm.core.IsolateListenerSupport; import com.oracle.svm.core.Isolates; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java index 7290fea6c6c6..d09a72a7ea24 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java @@ -29,7 +29,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; final class SamplerSampleWriter { diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java index 85dc89e26577..bcde98e44d7f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java @@ -32,7 +32,7 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerStackWalkVisitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerStackWalkVisitor.java index 3998a5b550d4..d6339a9ef24a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerStackWalkVisitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerStackWalkVisitor.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.deopt.DeoptimizedFrame; import com.oracle.svm.core.stack.ParameterizedStackFrameVisitor; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerThreadLocal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerThreadLocal.java index 72a20c2e4968..44dbab63788f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerThreadLocal.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerThreadLocal.java @@ -30,7 +30,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.SubstrateJVM; import com.oracle.svm.core.thread.ThreadListener; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java index 8f12c9473717..36b12202803e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java @@ -48,7 +48,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.VMInspectionOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoTable; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java index 89d65429ac00..d19501ab0b86 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java @@ -37,8 +37,8 @@ import com.oracle.svm.core.FrameAccess; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoQueryResult; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java index 1414c668a7c9..51c5aaa1334b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java @@ -27,7 +27,7 @@ import java.lang.reflect.GenericSignatureFormatError; import com.oracle.svm.core.SubstrateDiagnostics; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.core.code.FactoryMethodMarker; import com.oracle.svm.core.jdk.InternalVMMethod; import com.oracle.svm.core.jdk.StackTraceUtils; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/KnownIntrinsics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/KnownIntrinsics.java index e546e61ca65c..b700a391647e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/KnownIntrinsics.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/KnownIntrinsics.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.hub.DynamicHub; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java index 78052d21ec2c..4601368a37b0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java @@ -34,7 +34,7 @@ import com.oracle.svm.util.DirectAnnotationAccess; import org.graalvm.word.LocationIdentity; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateForeignCallTarget.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateForeignCallTarget.java index 91d28adba4f7..7ab2fdfe510c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateForeignCallTarget.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateForeignCallTarget.java @@ -29,8 +29,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.oracle.svm.core.annotate.StubCallingConvention; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.graal.code.StubCallingConvention; /** * Used for methods that are targets for foreign calls. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java index d640698e072c..919da35bb55a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.IsolateThread; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.threadlocal.FastThreadLocal; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; import com.oracle.svm.core.threadlocal.FastThreadLocalWord; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalk.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalk.java index 4c38368c6ef2..2261873f7476 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalk.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalk.java @@ -30,7 +30,7 @@ import org.graalvm.word.Pointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.UntetheredCodeInfo; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalker.java index 22cac8953ad0..4fe4f4ad43bc 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalker.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaStackWalker.java @@ -32,8 +32,8 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoQueryResult; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ParameterizedStackFrameVisitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ParameterizedStackFrameVisitor.java index e532f0770926..8a4b7c7a4a1c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ParameterizedStackFrameVisitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ParameterizedStackFrameVisitor.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackFrameVisitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackFrameVisitor.java index c766b86d5b3b..2acb47f9a16c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackFrameVisitor.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackFrameVisitor.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.deopt.DeoptimizedFrame; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java index 621bb13949a5..d2044ab62fbf 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java @@ -31,7 +31,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.thread.VMOperation; import com.oracle.svm.core.threadlocal.FastThreadLocalWord; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java index d015dffd0b99..06771a193c3c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java @@ -32,7 +32,7 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoQueryResult; import com.oracle.svm.core.code.CodeInfoTable; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java index 3e7c9bcd22d3..90b2c684915e 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java @@ -28,9 +28,9 @@ import org.graalvm.nativeimage.c.function.CodePointer; import org.graalvm.word.Pointer; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoAccess.DummyValueInfoAllocator; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java index fe62a3ef1894..50b40947d592 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java @@ -31,8 +31,8 @@ import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; import com.oracle.svm.core.heap.StoredContinuation; import com.oracle.svm.core.heap.StoredContinuationAccess; import com.oracle.svm.core.heap.VMOperationInfos; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java index 86a733b1c4b2..268b69be5877 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java @@ -32,9 +32,9 @@ 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.UnmanagedMemoryUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.graal.nodes.WriteStackPointerNode; import com.oracle.svm.core.heap.StoredContinuation; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java index 871604256ec5..26d7e1de73aa 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java @@ -40,7 +40,7 @@ import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jdk.JDK17OrEarlier; import com.oracle.svm.core.jdk.JDK19OrLater; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java index 3957c71d6b8c..a6cb42be87e1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java @@ -37,9 +37,9 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jfr.events.ThreadSleepEvent; import com.oracle.svm.core.snippets.KnownIntrinsics; import com.oracle.svm.util.ReflectionUtil; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaVMOperation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaVMOperation.java index 23079aa0eb9a..46a79a1df364 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaVMOperation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaVMOperation.java @@ -28,8 +28,8 @@ import com.oracle.svm.core.SubstrateOptions.ConcealedOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.VMOperationInfo; import com.oracle.svm.core.heap.VMOperationInfos; import com.oracle.svm.core.jdk.SplittableRandomAccessors; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/NativeVMOperation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/NativeVMOperation.java index c4c510a6ffdb..61e06b69cd04 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/NativeVMOperation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/NativeVMOperation.java @@ -28,7 +28,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.VMOperationInfo; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java index 8edd7fae9d23..79f75063192c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java @@ -27,7 +27,7 @@ import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.nativeimage.ImageSingletons; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicReference; /** diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java index 7539a02c1fd2..bd0cbc5eb28c 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java @@ -70,10 +70,10 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.heap.ReferenceHandler; import com.oracle.svm.core.heap.ReferenceHandlerThread; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java index 9068dc1b1b77..8e49f345d6df 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java @@ -48,13 +48,13 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.AlwaysInline; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.StubCallingConvention; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.util.DuplicatedInNativeCode; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.jfr.JfrTicks; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SpinLockUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SpinLockUtils.java index b27e765b2e33..7ee550c8d26f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SpinLockUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SpinLockUtils.java @@ -26,7 +26,7 @@ import org.graalvm.compiler.nodes.PauseNode; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import jdk.internal.misc.Unsafe; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java index c86f483590ee..8f2b607eb7a7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java @@ -42,7 +42,7 @@ import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.ContinuationsNotSupported; import com.oracle.svm.core.jdk.ContinuationsSupported; import com.oracle.svm.core.jdk.JDK11OrEarlier; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_jdk_internal_vm_Continuation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_jdk_internal_vm_Continuation.java index 54014f5de844..573dc95e5f6a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_jdk_internal_vm_Continuation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_jdk_internal_vm_Continuation.java @@ -31,7 +31,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Inject; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java index 1bd0b7b1591b..1fba2499b8fb 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.thread; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.thread.VMThreads.OSThreadHandle; import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.nativeimage.ImageSingletons; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadData.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadData.java index 80a00f6e8189..cae9991f0c67 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadData.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadData.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.thread; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.util.VMError; import jdk.internal.misc.Unsafe; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListener.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListener.java index ab455bef6e40..89c1118ce9b1 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListener.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListener.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.IsolateThread; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public interface ThreadListener { @Uninterruptible(reason = "Only uninterruptible code may be executed before Thread.run.") diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java index a0283ea6b14b..952601ba24ec 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java @@ -32,7 +32,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public class ThreadListenerSupport { private ThreadListener[] listeners; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java index 16ade13c07eb..45db23df7299 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java @@ -40,8 +40,8 @@ import org.graalvm.nativeimage.impl.ThreadingSupport; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.option.SubstrateOptionsParser; import com.oracle.svm.core.thread.Safepoint.SafepointException; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperation.java index 0fba185623d8..762ad5332b07 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperation.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperation.java @@ -29,8 +29,8 @@ import org.graalvm.nativeimage.IsolateThread; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.VMOperationInfo; import com.oracle.svm.core.jfr.JfrTicks; import com.oracle.svm.core.jfr.events.ExecuteVMOperationEvent; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java index c7a93931d819..7cd1285dc119 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java @@ -43,10 +43,10 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateOptions.ConcealedOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.heap.VMOperationInfos; import com.oracle.svm.core.locks.VMCondition; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListener.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListener.java index 0f370a2ee526..7e67090e5aa7 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListener.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListener.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.core.thread; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public interface VMOperationListener { @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java index d8e2f1645622..9e3669193f7b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java @@ -31,7 +31,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; public class VMOperationListenerSupport { private VMOperationListener[] listeners; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java index 459ed3956ee0..6f147454dd7a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java @@ -43,8 +43,8 @@ import com.oracle.svm.core.IsolateListenerSupport; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.c.function.CFunctionOptions; import com.oracle.svm.core.heap.Heap; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java index 89c3612e4190..2fcb56901b1f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java @@ -34,7 +34,7 @@ import org.graalvm.word.WordBase; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import jdk.vm.ci.meta.JavaKind; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java index 202ef3edbf78..b2e9c1905ece 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java @@ -40,7 +40,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.ReferenceAccess; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java index 59a685a8d00a..93dcadaa2851 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java @@ -27,9 +27,9 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalSTSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalSTSupport.java index fd0292cbac39..06ecbc505861 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalSTSupport.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalSTSupport.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownObjectField; public class VMThreadLocalSTSupport { @UnknownObjectField(types = {Object[].class}) public Object[] objectThreadLocals; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/Counter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/Counter.java index 910624b5cdc3..bc8b057cb2d0 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/Counter.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/Counter.java @@ -34,11 +34,11 @@ import org.graalvm.nativeimage.Platforms; import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.log.Log; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.util.Counter.Group; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DuplicatedInNativeCode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/DuplicatedInNativeCode.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DuplicatedInNativeCode.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/DuplicatedInNativeCode.java index 45e59eb92684..77b4e309c03b 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DuplicatedInNativeCode.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/DuplicatedInNativeCode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.util; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java index 401db4b2b2b4..259f2f00970a 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java @@ -28,7 +28,7 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.config.ConfigurationValues; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/PointerUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/PointerUtils.java index cd30ee9587f1..1076793cbd53 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/PointerUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/PointerUtils.java @@ -28,7 +28,7 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.UnsignedWord; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Utility methods on Pointers. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/RingBuffer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/RingBuffer.java index 311fb0c5d889..dd4f6f2ba971 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/RingBuffer.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/RingBuffer.java @@ -26,7 +26,7 @@ import java.util.function.Supplier; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Keeps the last-n entries and allows to read the out on demand.. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/SubstituteTarget.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/SubstituteTarget.java similarity index 97% rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/SubstituteTarget.java rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/SubstituteTarget.java index e61645498b4b..135e69648aef 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/SubstituteTarget.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/SubstituteTarget.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.oracle.svm.core.annotate; +package com.oracle.svm.core.util; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/TimeUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/TimeUtils.java index ca6a338a4e80..f92dc6db0635 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/TimeUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/TimeUtils.java @@ -27,7 +27,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.jdk.UninterruptibleUtils; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/UnsignedUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/UnsignedUtils.java index 351a9b64525a..ff31131b654f 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/UnsignedUtils.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/UnsignedUtils.java @@ -27,7 +27,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * Utility methods on Unsigned values. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/VMError.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/VMError.java index 5c1a560286b6..9adb60847d37 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/VMError.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/VMError.java @@ -27,7 +27,7 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** * A collection of static methods for error reporting of fatal error. A fatal error leaves the VM in diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java index 594c38f47b0b..a857cd031905 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java @@ -29,7 +29,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateOptions; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.Heap; import com.oracle.svm.core.snippets.KnownIntrinsics; import com.oracle.svm.core.util.VMError; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationMethod.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationMethod.java index fc7a6677cf5f..1c5bdee0b81c 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationMethod.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompilationMethod.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.graal.isolated; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.meta.SharedRuntimeMethod; /** Method object in the compiler isolate with an equivalent method object in the client isolate. */ diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java index 8f09bb632924..a0797cbe3c72 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java @@ -29,7 +29,7 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.nativeimage.c.type.CTypeConversion; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.handles.ThreadLocalHandles; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; import com.oracle.svm.core.threadlocal.FastThreadLocalObject; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java index 99b22e1f4383..cf876e3a7ba0 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java @@ -30,7 +30,7 @@ import org.graalvm.nativeimage.c.type.CCharPointerPointer; import org.graalvm.nativeimage.c.type.CTypeConversion; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.handles.ThreadLocalHandles; import com.oracle.svm.core.threadlocal.FastThreadLocalFactory; import com.oracle.svm.core.threadlocal.FastThreadLocalObject; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedHandles.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedHandles.java index ff3a5dae52f9..4ea94a765914 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedHandles.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedHandles.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.ObjectHandle; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.handles.ThreadLocalHandles; public final class IsolatedHandles { diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedMirroredObject.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedMirroredObject.java index 5effaa1490e3..03ba8f18a63c 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedMirroredObject.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedMirroredObject.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.graal.isolated; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; /** An object in the compiler isolate that has an equivalent in the client isolate. */ interface IsolatedMirroredObject { diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java index 1bc78386e1e0..00e1b50d1f15 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java @@ -26,7 +26,7 @@ import org.graalvm.nativeimage.c.function.CEntryPoint; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.meta.SubstrateObjectConstant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedReferenceAdjuster.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedReferenceAdjuster.java index 0ee29ed7bab8..c39226861688 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedReferenceAdjuster.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedReferenceAdjuster.java @@ -31,7 +31,7 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.c.NonmovableObjectArray; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeMethodInfoAccess.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeMethodInfoAccess.java index 976748cebb4c..5bc733ad3866 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeMethodInfoAccess.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeMethodInfoAccess.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.graal.isolated; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.c.NonmovableArrays; import com.oracle.svm.core.code.CodeInfo; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java index 01716d097eed..292e18f7c646 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java @@ -42,7 +42,7 @@ import org.graalvm.word.WordFactory; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.NonmovableArray; import com.oracle.svm.core.code.AbstractRuntimeCodeInstaller; import com.oracle.svm.core.code.CodeInfo; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java index 1c8036836ccd..5ee134ebd7f3 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java @@ -31,8 +31,8 @@ import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.hub.AnnotationsEncoding; import com.oracle.svm.core.meta.DirectSubstrateObjectConstant; import com.oracle.svm.core.meta.SharedField; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java index 7a1e3dce4927..b581c9d21178 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java @@ -26,7 +26,7 @@ import static com.oracle.svm.core.util.VMError.shouldNotReachHere; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import org.graalvm.compiler.core.common.CompilationIdentifier; import com.oracle.svm.core.code.CodeInfo; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java index 9b65dc30e5ed..342c0d680a7b 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java @@ -32,15 +32,15 @@ import java.lang.reflect.Type; import java.util.Arrays; -import com.oracle.svm.core.annotate.StubCallingConvention; import org.graalvm.compiler.core.common.util.TypeConversion; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; import org.graalvm.nativeimage.c.function.CEntryPoint; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.deopt.Deoptimizer; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.graal.meta.SharedRuntimeMethod; import com.oracle.svm.core.hub.AnnotationsEncoding; import com.oracle.svm.core.util.HostedStringDeduplication; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateType.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateType.java index 4ffcead8b2cf..a515dcecf064 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateType.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateType.java @@ -32,7 +32,7 @@ import org.graalvm.word.WordBase; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownObjectField; import com.oracle.svm.core.hub.DynamicHub; import com.oracle.svm.core.meta.SharedType; import com.oracle.svm.core.meta.SubstrateObjectConstant; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java index 6bf6c3ce3a72..eda4fd0653dc 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java @@ -86,11 +86,11 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateOptions.OptimizationLevel; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.NeverInlineTrivial; -import com.oracle.svm.core.annotate.UnknownClass; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.NeverInlineTrivial; +import com.oracle.svm.core.heap.UnknownClass; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode; import com.oracle.svm.core.graal.meta.SubstrateForeignCallLinkage; import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java index 1c45d2dbadea..43884b6ead50 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java @@ -38,7 +38,7 @@ import com.oracle.graal.pointsto.meta.AnalysisType; import com.oracle.graal.pointsto.results.StrengthenGraphs; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode; import com.oracle.svm.core.nodes.SubstrateMethodCallTargetNode; import com.oracle.svm.core.snippets.SnippetRuntime; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CustomTypeFieldHandler.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CustomTypeFieldHandler.java index 0963f5953979..d2f9ef6ee88f 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CustomTypeFieldHandler.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CustomTypeFieldHandler.java @@ -39,8 +39,8 @@ import com.oracle.graal.pointsto.meta.AnalysisField; import com.oracle.graal.pointsto.meta.AnalysisMetaAccess; import com.oracle.graal.pointsto.meta.AnalysisType; -import com.oracle.svm.core.annotate.UnknownObjectField; -import com.oracle.svm.core.annotate.UnknownPrimitiveField; +import com.oracle.svm.core.heap.UnknownObjectField; +import com.oracle.svm.core.heap.UnknownPrimitiveField; import com.oracle.svm.hosted.substitute.ComputedValueField; import jdk.vm.ci.meta.JavaKind; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisMethodCalleeWalker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisMethodCalleeWalker.java index 0b5c06bbcfbf..d402af3c1c42 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisMethodCalleeWalker.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisMethodCalleeWalker.java @@ -30,7 +30,7 @@ import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.graal.pointsto.meta.InvokeInfo; -import com.oracle.svm.core.annotate.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess; import com.oracle.svm.hosted.code.AnalysisMethodCalleeWalker.CallPathVisitor.VisitResult; import jdk.vm.ci.code.BytecodePosition; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java index 0962fe160293..5a1236657e71 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java @@ -60,7 +60,7 @@ import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.graal.pointsto.meta.HostedProviders; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointBuiltins; import com.oracle.svm.core.c.function.CEntryPointBuiltins.CEntryPointBuiltinImplementation; import com.oracle.svm.core.c.function.CEntryPointOptions; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java index 553c91bf94c6..d0bfc136850a 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java @@ -35,8 +35,8 @@ import org.graalvm.compiler.options.OptionValues; import com.oracle.graal.pointsto.flow.AnalysisParsedGraph; -import com.oracle.svm.core.annotate.DeoptTest; -import com.oracle.svm.core.annotate.Specialize; +import com.oracle.svm.core.deopt.DeoptTest; +import com.oracle.svm.core.deopt.Specialize; import com.oracle.svm.hosted.code.CompileQueue.CompileFunction; import com.oracle.svm.hosted.code.CompileQueue.ParseFunction; import com.oracle.svm.hosted.meta.HostedMethod; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java index f842450fcb94..e6e32d438bf6 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java @@ -143,14 +143,14 @@ import com.oracle.graal.pointsto.util.CompletionExecutor.DebugContextRunnable; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateOptions.OptimizationLevel; -import com.oracle.svm.core.annotate.DeoptTest; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Specialize; -import com.oracle.svm.core.annotate.StubCallingConvention; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.FrameInfoEncoder; import com.oracle.svm.core.deopt.DeoptEntryInfopoint; +import com.oracle.svm.core.deopt.DeoptTest; +import com.oracle.svm.core.deopt.Specialize; import com.oracle.svm.core.graal.GraalConfiguration; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.graal.code.SubstrateBackend; import com.oracle.svm.core.graal.meta.RuntimeConfiguration; import com.oracle.svm.core.graal.meta.SubstrateForeignCallLinkage; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/EntryPointCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/EntryPointCallStubMethod.java index 4721baa07310..292eff0cbb90 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/EntryPointCallStubMethod.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/EntryPointCallStubMethod.java @@ -27,7 +27,7 @@ import java.lang.annotation.Annotation; import java.util.Objects; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.util.ReflectionUtil; import jdk.vm.ci.meta.ConstantPool; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java index 099be0654dbf..b2096cad86cd 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java @@ -39,7 +39,7 @@ import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.graal.pointsto.meta.HostedProviders; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInlineTrivial; +import com.oracle.svm.core.NeverInlineTrivial; import com.oracle.svm.hosted.meta.HostedMethod; import com.oracle.svm.hosted.phases.HostedGraphKit; import com.oracle.svm.util.ReflectionUtil; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java index 51ba6fd24f0c..1ec37da29ffb 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java @@ -35,7 +35,7 @@ import org.graalvm.nativeimage.ImageSingletons; import com.oracle.graal.pointsto.meta.AnalysisMethod; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; import com.oracle.svm.core.heap.RestrictHeapAccessCallees; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.util.UserError; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessCalleesImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessCalleesImpl.java index aec025a583bc..71c528302ffc 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessCalleesImpl.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessCalleesImpl.java @@ -37,9 +37,9 @@ import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.RestrictHeapAccess.Access; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.heap.RestrictHeapAccess.Access; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.heap.RestrictHeapAccessCallees; import com.oracle.svm.core.util.VMError; import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java index 7c7057bc63bb..bac0b6936d1e 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java @@ -41,7 +41,7 @@ import org.graalvm.nativeimage.hosted.Feature; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.util.UserError; import com.oracle.svm.hosted.meta.HostedMethod; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java index 67a387245c14..b08425f7e01f 100755 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java @@ -38,7 +38,7 @@ import com.oracle.objectfile.ObjectFile.RelocationKind; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.code.CGlobalDataReference; import com.oracle.svm.core.graal.code.PatchConsumerFactory; import com.oracle.svm.core.meta.MethodPointer; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java index 07311c1c87fd..c82157b7ea2c 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java @@ -37,7 +37,7 @@ import com.oracle.objectfile.ObjectFile; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.graal.code.CGlobalDataReference; import com.oracle.svm.core.graal.code.PatchConsumerFactory; import com.oracle.svm.core.meta.MethodPointer; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java index 873f0d9abb4f..8228b75aacf0 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java @@ -26,8 +26,8 @@ import org.graalvm.compiler.core.common.NumUtil; -import com.oracle.svm.core.annotate.Hybrid; import com.oracle.svm.core.config.ObjectLayout; +import com.oracle.svm.core.hub.Hybrid; import com.oracle.svm.hosted.meta.HostedField; import com.oracle.svm.hosted.meta.HostedInstanceClass; import com.oracle.svm.hosted.meta.HostedMetaAccess; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java index 58de59baa9b2..b855e56bf34c 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java @@ -29,7 +29,7 @@ import org.graalvm.compiler.api.replacements.Fold; import org.graalvm.nativeimage.ImageSingletons; -import com.oracle.svm.core.annotate.Hybrid; +import com.oracle.svm.core.hub.Hybrid; import com.oracle.svm.hosted.meta.HostedField; import com.oracle.svm.hosted.meta.HostedInstanceClass; import com.oracle.svm.hosted.meta.HostedType; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java index 303ed82ebcc8..ad61601bb44c 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java @@ -45,11 +45,10 @@ import org.graalvm.compiler.nodes.UnwindNode; import org.graalvm.compiler.nodes.ValueNode; import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import com.oracle.svm.util.GuardedAnnotationAccess; import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor; import com.oracle.graal.pointsto.meta.HostedProviders; -import com.oracle.svm.core.annotate.DeoptTest; +import com.oracle.svm.core.deopt.DeoptTest; import com.oracle.svm.core.graal.nodes.DeoptEntryBeginNode; import com.oracle.svm.core.graal.nodes.DeoptEntryNode; import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode; @@ -61,6 +60,7 @@ import com.oracle.svm.hosted.annotation.CustomSubstitutionMethod; import com.oracle.svm.hosted.nodes.DeoptProxyNode; import com.oracle.svm.hosted.phases.HostedGraphKit; +import com.oracle.svm.util.GuardedAnnotationAccess; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodSupport.java index b74c1bf7c6d8..3348b35d0122 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodSupport.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodSupport.java @@ -49,13 +49,13 @@ import org.graalvm.nativeimage.hosted.Feature; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.DeoptTest; -import com.oracle.svm.core.annotate.Hybrid; +import com.oracle.svm.core.deopt.DeoptTest; import com.oracle.svm.core.heap.Pod; import com.oracle.svm.core.heap.Pod.Builder; import com.oracle.svm.core.heap.Pod.RuntimeSupport.PodFactory; import com.oracle.svm.core.heap.Pod.RuntimeSupport.PodInfo; import com.oracle.svm.core.heap.Pod.RuntimeSupport.PodSpec; +import com.oracle.svm.core.hub.Hybrid; import com.oracle.svm.core.hub.LayoutEncoding; import com.oracle.svm.core.util.UserError; import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java index 161828267ed2..a47f663b810a 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java @@ -43,9 +43,9 @@ import com.oracle.graal.pointsto.meta.HostedProviders; import com.oracle.graal.pointsto.results.StaticAnalysisResults; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.StubCallingConvention; +import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.deopt.Deoptimizer; +import com.oracle.svm.core.graal.code.StubCallingConvention; import com.oracle.svm.core.meta.MethodPointer; import com.oracle.svm.core.meta.SharedMethod; import com.oracle.svm.core.meta.SubstrateMethodPointerConstant; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java index 7c3734758613..3dbb405883fa 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java @@ -68,7 +68,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; import com.oracle.svm.core.annotate.AutomaticFeature; -import com.oracle.svm.core.annotate.ExcludeFromReferenceMap; +import com.oracle.svm.core.heap.ExcludeFromReferenceMap; import com.oracle.svm.core.c.BoxedRelocatedPointer; import com.oracle.svm.core.c.function.CFunctionOptions; import com.oracle.svm.core.config.ConfigurationValues; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java index b06f3705af2d..a9c92143155e 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java @@ -67,7 +67,7 @@ import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.svm.core.FrameAccess; -import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer; +import com.oracle.svm.core.c.InvokeJavaFunctionPointer; import com.oracle.svm.core.c.struct.CInterfaceLocationIdentity; import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind; import com.oracle.svm.core.graal.nodes.CInterfaceReadNode; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java index 791646b328aa..8aeac3de0623 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java @@ -55,8 +55,8 @@ import com.oracle.graal.pointsto.meta.AnalysisMetaAccess; import com.oracle.graal.pointsto.meta.AnalysisMethod; import com.oracle.graal.pointsto.phases.InlineBeforeAnalysisPolicy; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.option.HostedOptionKey; import com.oracle.svm.core.util.VMError; import com.oracle.svm.hosted.SVMHost; diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java index 415e5154d378..a6d590a3cbef 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java @@ -109,7 +109,7 @@ import com.oracle.svm.core.StaticFieldsSupport; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode; import com.oracle.svm.core.config.ConfigurationValues; import com.oracle.svm.core.graal.GraalEdgeUnsafePartition; diff --git a/substratevm/src/com.oracle.svm.jvmtiagentbase/src/com/oracle/svm/jvmtiagentbase/AgentIsolate.java b/substratevm/src/com.oracle.svm.jvmtiagentbase/src/com/oracle/svm/jvmtiagentbase/AgentIsolate.java index bb37e42ab190..341a6966eb28 100644 --- a/substratevm/src/com.oracle.svm.jvmtiagentbase/src/com/oracle/svm/jvmtiagentbase/AgentIsolate.java +++ b/substratevm/src/com.oracle.svm.jvmtiagentbase/src/com/oracle/svm/jvmtiagentbase/AgentIsolate.java @@ -31,7 +31,7 @@ import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.nativeimage.c.type.WordPointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CGlobalData; import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NoHostedAnnotationsTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NoHostedAnnotationsTest.java index ea4e20e602cd..4353cdb7cd22 100644 --- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NoHostedAnnotationsTest.java +++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NoHostedAnnotationsTest.java @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Test; -import com.oracle.svm.core.annotate.DuplicatedInNativeCode; +import com.oracle.svm.core.util.DuplicatedInNativeCode; public class NoHostedAnnotationsTest { diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java index 9195c135e5e4..6e318f1d55a0 100644 --- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java +++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java @@ -30,7 +30,7 @@ import org.graalvm.word.WordFactory; import org.junit.Test; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.jdk.StackTraceUtils; import com.oracle.svm.core.snippets.KnownIntrinsics; diff --git a/substratevm/src/com.oracle.svm.test/src/hello/Hello.java b/substratevm/src/com.oracle.svm.test/src/hello/Hello.java index 4ea5c8366924..bcd6936efe71 100644 --- a/substratevm/src/com.oracle.svm.test/src/hello/Hello.java +++ b/substratevm/src/com.oracle.svm.test/src/hello/Hello.java @@ -28,8 +28,8 @@ // Checkstyle: stop -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; public class Hello { public abstract static class Greeter { diff --git a/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java b/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java index 4149a746115f..e1a1717d582b 100644 --- a/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java +++ b/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java @@ -26,8 +26,8 @@ package hello; -import com.oracle.svm.core.annotate.AlwaysInline; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.AlwaysInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; import com.oracle.svm.core.annotate.TargetElement; diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java index 800dc9c3b758..3aac49ff6ef2 100644 --- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java +++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java @@ -35,7 +35,7 @@ import org.graalvm.word.PointerBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointActions; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.ReturnNullPointer; diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java index f767295174bf..d5204c5e575a 100644 --- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java +++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java @@ -42,7 +42,7 @@ import org.graalvm.word.WordBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.function.CEntryPointActions; import com.oracle.svm.core.c.function.CEntryPointOptions; import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue; diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeSignature.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeSignature.java index 82137dd0f7e5..318145a913ef 100644 --- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeSignature.java +++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeSignature.java @@ -41,8 +41,8 @@ import org.graalvm.word.WordBase; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.headers.LibC; import com.oracle.svm.core.nodes.CFunctionEpilogueNode; import com.oracle.svm.core.nodes.CFunctionPrologueNode; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java index 11704e936763..155c00cf0df7 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java @@ -74,7 +74,7 @@ import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.AnnotateOriginal; import com.oracle.svm.core.annotate.Delete; -import com.oracle.svm.core.annotate.NeverInline; +import com.oracle.svm.core.NeverInline; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind; import com.oracle.svm.core.annotate.Substitute; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTarget.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTarget.java index aaf509cad848..8472317d7105 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTarget.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTarget.java @@ -27,8 +27,8 @@ import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget; import org.graalvm.nativeimage.c.function.CFunctionPointer; -import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; +import com.oracle.svm.core.c.InvokeJavaFunctionPointer; import com.oracle.svm.core.deopt.SubstrateSpeculationLog; import com.oracle.svm.core.thread.VMOperation; import com.oracle.svm.truffle.TruffleSupport; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java index 25b7d295a1da..7271f79f8d10 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java @@ -30,7 +30,7 @@ import org.graalvm.compiler.truffle.common.TruffleCompiler; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.code.CodeInfo; import com.oracle.svm.core.code.CodeInfoAccess; import com.oracle.svm.core.code.CodeInfoTable; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java index 06dc43889c5b..87a85b515dfa 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java @@ -34,9 +34,9 @@ import org.graalvm.word.Pointer; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.NeverInline; -import com.oracle.svm.core.annotate.RestrictHeapAccess; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.NeverInline; +import com.oracle.svm.core.heap.RestrictHeapAccess; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.deopt.DeoptimizationRuntime; import com.oracle.svm.core.deopt.Deoptimizer; import com.oracle.svm.core.log.Log; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java index c778cf340f86..601d34d321b5 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java @@ -54,7 +54,7 @@ import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.SubstrateUtil; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.deopt.Deoptimizer; import com.oracle.svm.core.deopt.SubstrateSpeculationLog; import com.oracle.svm.core.jdk.RuntimeSupport; diff --git a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java index 950aab1bce1d..6365c41ff502 100644 --- a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java +++ b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java @@ -106,7 +106,7 @@ import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CConst; import com.oracle.svm.core.c.CHeader; import com.oracle.svm.core.c.CUnsigned; diff --git a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIEntryPoints.java b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIEntryPoints.java index a8a29b3e72b5..59a7c7d4527a 100644 --- a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIEntryPoints.java +++ b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIEntryPoints.java @@ -40,7 +40,7 @@ import org.graalvm.polyglot.nativeapi.types.PolyglotNativeAPITypes.PolyglotIsolateThread; import org.graalvm.polyglot.nativeapi.types.PolyglotNativeAPITypes.PolyglotIsolateThreadPointer; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; import com.oracle.svm.core.c.CConst; import com.oracle.svm.core.c.CHeader; import com.oracle.svm.core.c.CTypedef; diff --git a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIError.java b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIError.java index 26b1174a059c..7b80f03fb55e 100644 --- a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIError.java +++ b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPIError.java @@ -26,7 +26,7 @@ import org.graalvm.polyglot.nativeapi.types.PolyglotNativeAPITypes.PolyglotStatus; -import com.oracle.svm.core.annotate.Uninterruptible; +import com.oracle.svm.core.Uninterruptible; class PolyglotNativeAPIError extends RuntimeException {