[GR-36606] Remove hosted annotations from getAnnotation method.

PullRequest: graal/11386
oracle · May 6, 2022 · 4f395cd · 4f395cd
2 parents 4066b56 + 3e93ee2
commit 4f395cd
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 0 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Alias.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/Alias.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -51,5 +54,6 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface Alias {
 }
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/annotate/AlwaysInline.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -34,6 +37,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface AlwaysInline {
 
     /**

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
@@ -24,6 +24,9 @@
  */
 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;
@@ -38,5 +41,6 @@
  */
 @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
@@ -24,6 +24,9 @@
  */
 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;
@@ -35,5 +38,6 @@
  */
 @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
@@ -24,6 +24,9 @@
  */
 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;
@@ -37,6 +40,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface Delete {
 
     /**

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/annotate/DeoptTest.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -37,6 +40,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface DeoptTest {
 
 }
diff --git a/...tevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DuplicatedInNativeCode.java b/...tevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/DuplicatedInNativeCode.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -35,5 +38,6 @@
  */
 @Retention(RetentionPolicy.SOURCE)
 @Target(value = {ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface DuplicatedInNativeCode {
 }
diff --git a/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExcludeFromReferenceMap.java b/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/ExcludeFromReferenceMap.java
@@ -39,6 +39,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface ExcludeFromReferenceMap {
 
     /**

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
@@ -24,6 +24,9 @@
  */
 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;
@@ -38,5 +41,6 @@
  */
 @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/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InjectAccessors.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -57,6 +60,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface InjectAccessors {
 
     Class<?> value();

diff --git a/...m/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InvokeJavaFunctionPointer.java b/...m/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/InvokeJavaFunctionPointer.java
@@ -29,6 +29,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 
 /**
@@ -38,5 +40,6 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface InvokeJavaFunctionPointer {
 }
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
@@ -24,6 +24,9 @@
  */
 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;
@@ -41,5 +44,6 @@
  */
 @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/NeverInlineTrivial.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/NeverInlineTrivial.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -35,6 +38,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface NeverInlineTrivial {
 
     /**

diff --git a/...tratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java b/...tratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java
@@ -34,6 +34,8 @@
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 
 /**
  * Mechanism to change the value of a field. Normally, field values in the native image heap of the
@@ -45,6 +47,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface RecomputeFieldValue {
 
     enum Kind {

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/annotate/RestrictHeapAccess.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -35,6 +38,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface RestrictHeapAccess {
     enum Access {
         UNRESTRICTED,

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/annotate/Specialize.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -42,6 +45,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface Specialize {
 
 }
diff --git a/...atevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java b/...atevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/StubCallingConvention.java
@@ -29,6 +29,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 import org.graalvm.util.GuardedAnnotationAccess;
 
 import com.oracle.svm.core.CalleeSavedRegisters;
@@ -45,6 +47,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface StubCallingConvention {
 
     class Utils {

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
@@ -24,6 +24,9 @@
  */
 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;
@@ -52,6 +55,7 @@
  */
 @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/SubstituteTarget.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/SubstituteTarget.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -37,5 +40,6 @@
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.FIELD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface SubstituteTarget {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetClass.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/TargetClass.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -71,6 +74,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface TargetClass {
 
     /**

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
@@ -24,6 +24,9 @@
  */
 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;
@@ -39,6 +42,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface TargetElement {
 
     String CONSTRUCTOR_NAME = "<init>";

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/annotate/UnknownClass.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -37,6 +40,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.TYPE})
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface UnknownClass {
 
 }
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/annotate/UnknownObjectField.java
@@ -24,6 +24,9 @@
  */
 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;
@@ -37,6 +40,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
+@Platforms(Platform.HOSTED_ONLY.class)
 public @interface UnknownObjectField {
 
     /**