8144223: Move j.l.invoke.{ForceInline, DontInline, Stable} to jdk.internal.vm.annotation package
Reviewed-by: jrose, vlivanov, mchung, roland
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/Stable.java Thu Dec 03 11:18:34 2015 +0100
@@ -29,7 +29,7 @@
import java.lang.annotation.Target;
/**
- * This annotation functions as an alias for the java.lang.invoke.Stable annotation within JVMCI
+ * This annotation functions as an alias for the jdk.internal.vm.annotation.Stable annotation within JVMCI
* code. It is specially recognized during class file parsing in the same way as that annotation.
*/
@Target(ElementType.FIELD)
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Dec 03 11:18:34 2015 +0100
@@ -1733,11 +1733,11 @@
if (_location != _in_method) break; // only allow for methods
if (!privileged) break; // only allow in privileged code
return _method_CallerSensitive;
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature):
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_ForceInline_signature):
if (_location != _in_method) break; // only allow for methods
if (!privileged) break; // only allow in privileged code
return _method_ForceInline;
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature):
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_DontInline_signature):
if (_location != _in_method) break; // only allow for methods
if (!privileged) break; // only allow in privileged code
return _method_DontInline;
@@ -1763,7 +1763,7 @@
if (!privileged) break; // only allow in privileged code
return _field_Stable;
#endif
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_Stable_signature):
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Stable_signature):
if (_location != _in_field) break; // only allow for fields
if (!privileged) break; // only allow in privileged code
return _field_Stable;
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Dec 03 11:18:34 2015 +0100
@@ -268,6 +268,9 @@
\
/* Intrinsic Annotation (JDK 9 and above) */ \
template(jdk_internal_HotSpotIntrinsicCandidate_signature, "Ljdk/internal/HotSpotIntrinsicCandidate;") \
+ template(jdk_internal_vm_annotation_ForceInline_signature, "Ljdk/internal/vm/annotation/ForceInline;") \
+ template(jdk_internal_vm_annotation_DontInline_signature, "Ljdk/internal/vm/annotation/DontInline;") \
+ template(jdk_internal_vm_annotation_Stable_signature, "Ljdk/internal/vm/annotation/Stable;") \
\
/* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
@@ -286,10 +289,7 @@
template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \
template(java_lang_invoke_MethodHandleNatives_CallSiteContext, "java/lang/invoke/MethodHandleNatives$CallSiteContext") \
template(java_lang_invoke_LambdaForm, "java/lang/invoke/LambdaForm") \
- template(java_lang_invoke_ForceInline_signature, "Ljava/lang/invoke/ForceInline;") \
- template(java_lang_invoke_DontInline_signature, "Ljava/lang/invoke/DontInline;") \
template(java_lang_invoke_InjectedProfile_signature, "Ljava/lang/invoke/InjectedProfile;") \
- template(java_lang_invoke_Stable_signature, "Ljava/lang/invoke/Stable;") \
template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \
template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;") \
template(java_lang_invoke_MethodHandleNatives_CallSiteContext_signature, "Ljava/lang/invoke/MethodHandleNatives$CallSiteContext;") \
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java Thu Dec 03 11:18:34 2015 +0100
@@ -41,6 +41,9 @@
import sun.hotspot.WhiteBox;
+import jdk.internal.vm.annotation.DontInline;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.ref.*;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Thu Dec 03 11:18:34 2015 +0100
@@ -43,6 +43,9 @@
package java.lang.invoke;
import sun.hotspot.WhiteBox;
+
+import jdk.internal.vm.annotation.DontInline;
+
import static jdk.test.lib.Asserts.*;
public class InvokeTest {
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Thu Dec 03 11:18:34 2015 +0100
@@ -44,6 +44,7 @@
import sun.misc.Unsafe;
import jdk.internal.org.objectweb.asm.*;
+import jdk.internal.vm.annotation.DontInline;
import java.lang.instrument.ClassDefinition;
import java.lang.instrument.Instrumentation;
@@ -73,7 +74,7 @@
cw.visit(52, ACC_PUBLIC | ACC_SUPER, NAME, null, "java/lang/Object", null);
{
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "f", "()I", null, null);
- mv.visitAnnotation("Ljava/lang/invoke/DontInline;", true);
+ mv.visitAnnotation("Ljdk/internal/vm/annotation/DontInline;", true);
mv.visitCode();
mv.visitLdcInsn(r);
mv.visitInsn(IRETURN);
--- a/hotspot/test/compiler/stable/TestStableBoolean.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableBoolean.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableBoolean {
--- a/hotspot/test/compiler/stable/TestStableByte.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableByte.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableByte {
--- a/hotspot/test/compiler/stable/TestStableChar.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableChar.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableChar {
--- a/hotspot/test/compiler/stable/TestStableDouble.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableDouble.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableDouble {
--- a/hotspot/test/compiler/stable/TestStableFloat.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableFloat.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableFloat {
--- a/hotspot/test/compiler/stable/TestStableInt.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableInt.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableInt {
--- a/hotspot/test/compiler/stable/TestStableLong.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableLong.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableLong {
--- a/hotspot/test/compiler/stable/TestStableMemoryBarrier.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableMemoryBarrier.java Thu Dec 03 11:18:34 2015 +0100
@@ -36,6 +36,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableMemoryBarrier {
--- a/hotspot/test/compiler/stable/TestStableObject.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableObject.java Thu Dec 03 11:18:34 2015 +0100
@@ -83,6 +83,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableObject {
--- a/hotspot/test/compiler/stable/TestStableShort.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/stable/TestStableShort.java Thu Dec 03 11:18:34 2015 +0100
@@ -82,6 +82,8 @@
*/
package java.lang.invoke;
+import jdk.internal.vm.annotation.Stable;
+
import java.lang.reflect.InvocationTargetException;
public class TestStableShort {
--- a/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java Tue Dec 08 10:01:33 2015 +0000
+++ b/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java Thu Dec 03 11:18:34 2015 +0100
@@ -40,10 +40,16 @@
*/
package java.lang.invoke;
-import jdk.internal.org.objectweb.asm.*;
+import jdk.internal.vm.annotation.DontInline;
+import jdk.internal.vm.annotation.Stable;
+import jdk.internal.misc.Unsafe;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
import jdk.test.lib.Asserts;
-import jdk.test.lib.Utils;
-import jdk.internal.misc.Unsafe;
+
import static jdk.internal.org.objectweb.asm.Opcodes.*;
public class UnsafeGetConstantField {