author | vlivanov |
Wed, 24 Jul 2019 10:50:40 +0300 | |
changeset 57574 | 6a159c6c23cc |
parent 55105 | 9ad765641e8f |
child 58679 | 9c3209ff7550 |
permissions | -rw-r--r-- |
55105
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
1 |
/* |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
4 |
* |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
8 |
* |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
13 |
* accompanied this code). |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
14 |
* |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
18 |
* |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
21 |
* questions. |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
22 |
*/ |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
23 |
|
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
24 |
#include <jni.h> |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
25 |
|
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
26 |
static jmethodID methodId; |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
27 |
|
57574
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
28 |
static jclass test_class_A; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
29 |
static jclass test_class_B; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
30 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
31 |
static jmethodID test_staticM_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
32 |
static jmethodID test_staticS_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
33 |
static jmethodID test_staticN_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
34 |
static jmethodID test_A_m_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
35 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
36 |
static jfieldID test_staticF_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
37 |
static jfieldID test_A_f_id; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
38 |
|
55105
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
39 |
extern "C" { |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
40 |
JNIEXPORT jboolean JNICALL Java_ClassInitBarrier_init(JNIEnv* env, jclass cls) { |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
41 |
jclass runnable = env->FindClass("java/lang/Runnable"); |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
42 |
if (runnable == NULL) return JNI_FALSE; |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
43 |
|
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
44 |
methodId = env->GetMethodID(runnable, "run", "()V"); |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
45 |
if (methodId == NULL) return JNI_FALSE; |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
46 |
|
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
47 |
return JNI_TRUE; |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
48 |
} |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
49 |
|
57574
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
50 |
JNIEXPORT jboolean JNICALL Java_ClassInitBarrier_00024Test_00024A_init(JNIEnv* env, jclass cls, jclass arg1) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
51 |
test_class_A = (jclass)env->NewGlobalRef(cls); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
52 |
if (test_class_A == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
53 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
54 |
test_class_B = (jclass)env->NewGlobalRef(arg1); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
55 |
if (test_class_B == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
56 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
57 |
test_staticM_id = env->GetStaticMethodID(test_class_A, "staticM", "(Ljava/lang/Runnable;)V"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
58 |
if (test_staticM_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
59 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
60 |
test_staticS_id = env->GetStaticMethodID(test_class_A, "staticS", "(Ljava/lang/Runnable;)V"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
61 |
if (test_staticS_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
62 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
63 |
test_staticN_id = env->GetStaticMethodID(test_class_A, "staticN", "(Ljava/lang/Runnable;)V"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
64 |
if (test_staticN_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
65 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
66 |
test_A_m_id = env->GetMethodID(test_class_A, "m", "()V"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
67 |
if (test_A_m_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
68 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
69 |
test_staticF_id = env->GetStaticFieldID(test_class_A, "staticF", "I"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
70 |
if (test_staticF_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
71 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
72 |
test_A_f_id = env->GetFieldID(test_class_A, "f", "I"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
73 |
if (test_A_f_id == NULL) return JNI_FALSE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
74 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
75 |
return JNI_TRUE; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
76 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
77 |
|
55105
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
78 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_00024A_staticN(JNIEnv* env, jclass cls, jobject action) { |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
79 |
env->CallVoidMethod(action, methodId); |
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
80 |
} |
57574
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
81 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
82 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testInvokeStaticJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
83 |
env->CallStaticVoidMethod(test_class_A, test_staticM_id, action); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
84 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
85 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
86 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testInvokeStaticSyncJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
87 |
env->CallStaticVoidMethod(test_class_A, test_staticS_id, action); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
88 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
89 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
90 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testInvokeStaticNativeJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
91 |
env->CallStaticVoidMethod(test_class_A, test_staticN_id, action); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
92 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
93 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
94 |
JNIEXPORT jint JNICALL Java_ClassInitBarrier_00024Test_testGetStaticJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
95 |
jint v = env->GetStaticIntField(test_class_A, test_staticF_id); // int v = A.staticF; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
96 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
97 |
return v; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
98 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
99 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
100 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testPutStaticJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
101 |
env->SetStaticIntField(test_class_A, test_staticF_id, 1); // A.staticF = 1; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
102 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
103 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
104 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
105 |
JNIEXPORT jobject JNICALL Java_ClassInitBarrier_00024Test_testNewInstanceAJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
106 |
jobject obj = env->AllocObject(test_class_A); // A obj = new A(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
107 |
if (env->ExceptionOccurred()) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
108 |
return NULL; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
109 |
} else if (obj == NULL) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
110 |
jclass errorClass = env->FindClass("java/lang/AssertionError"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
111 |
int ret = env->ThrowNew(errorClass, "JNI: AllocObject: allocation failed, but no exception thrown"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
112 |
return NULL; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
113 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
114 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
115 |
return obj; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
116 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
117 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
118 |
JNIEXPORT jobject JNICALL Java_ClassInitBarrier_00024Test_testNewInstanceBJNI(JNIEnv* env, jclass cls, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
119 |
jobject obj = env->AllocObject(test_class_B); // B obj = new B(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
120 |
if (env->ExceptionOccurred()) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
121 |
return NULL; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
122 |
} else if (obj == NULL) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
123 |
jclass errorClass = env->FindClass("java/lang/AssertionError"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
124 |
int ret = env->ThrowNew(errorClass, "JNI: AllocObject: allocation failed, but no exception thrown"); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
125 |
return NULL; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
126 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
127 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
128 |
return obj; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
129 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
130 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
131 |
JNIEXPORT jint JNICALL Java_ClassInitBarrier_00024Test_testGetFieldJNI(JNIEnv* env, jclass cls, jobject recv, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
132 |
jint v = env->GetIntField(recv, test_A_f_id); // int v = recv.f; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
133 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
134 |
return v; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
135 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
136 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
137 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testPutFieldJNI(JNIEnv* env, jclass cls, jobject recv, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
138 |
env->SetIntField(recv, test_A_f_id, 1); // A.staticF = 1; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
139 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
140 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
141 |
|
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
142 |
JNIEXPORT void JNICALL Java_ClassInitBarrier_00024Test_testInvokeVirtualJNI(JNIEnv* env, jclass cls, jobject recv, jobject action) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
143 |
env->CallVoidMethod(recv, test_A_m_id); // recv.m(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
144 |
if (env->ExceptionOccurred()) { |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
145 |
return; |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
146 |
} |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
147 |
env->CallVoidMethod(action, methodId); // action.run(); |
6a159c6c23cc
8227260: JNI upcalls should bypass class initialization barrier in c2i adapter
vlivanov
parents:
55105
diff
changeset
|
148 |
} |
55105
9ad765641e8f
8223213: Implement fast class initialization checks on x86-64
vlivanov
parents:
diff
changeset
|
149 |
} |