Skip to content

8312235: [JVMCI] ConstantPool should not force eager resolution #14927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

8312235: [JVMCI] ConstantPool should not force eager resolution #14927

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8e7ead
add ConstantPool.lookupConstant(int cpi, boolean resolve)
dougxc Jul 18, 2023
54c5404
update TestDynamicConstant to test new ConstantPool.lookupConstant me…
dougxc Jul 19, 2023
4621c13
avoid bootstrap method invocation by lookupBootstrapMethodInfo
dougxc Jul 20, 2023
2952db0
Merge remote-tracking branch 'openjdk-jdk/master' into JDK-8312235
dougxc Jul 24, 2023
543d9af
clarified naming around decoding an encoded indy index to a constant …
dougxc Jul 26, 2023
5ada646
clarified when null is returned by lookupConstantInPool
dougxc Jul 26, 2023
1ca9ab6
renamed index to cp_index
dougxc Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,24 +697,24 @@ C2V_VMENTRY_NULL(jobject, getUncachedStringInPool, (JNIEnv* env, jobject, ARGUME
return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(obj));
C2V_END

C2V_VMENTRY_NULL(jobject, lookupConstantInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint index, bool resolve))
C2V_VMENTRY_NULL(jobject, lookupConstantInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint cp_index, bool resolve))
constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
oop obj;
if (!resolve) {
bool found_it;
obj = cp->find_cached_constant_at(index, found_it, CHECK_NULL);
obj = cp->find_cached_constant_at(cp_index, found_it, CHECK_NULL);
if (!found_it) {
return nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be some sort of exception or error checking here or in the caller? If the constant can't be found it either isn't resolved or the index is invalid, correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error checking is already done by the call to getTagAt in HotSpotConstantPool.lookupConstant(int cpi, boolean resolve).
I'll add more javadoc to clarify when a null is returned.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the javadoc of lookupConstantInPool already states:

     * The behavior of this method is undefined if {@code cpi} does not denote one of the following
     * entry types: {@code JVM_CONSTANT_Dynamic}, {@code JVM_CONSTANT_String},
     * {@code JVM_CONSTANT_MethodHandle}, {@code JVM_CONSTANT_MethodHandleInError},
     * {@code JVM_CONSTANT_MethodType} and {@code JVM_CONSTANT_MethodTypeInError}.

}
} else {
obj = cp->resolve_possibly_cached_constant_at(index, CHECK_NULL);
obj = cp->resolve_possibly_cached_constant_at(cp_index, CHECK_NULL);
}
constantTag tag = cp->tag_at(index);
constantTag tag = cp->tag_at(cp_index);
if (tag.is_dynamic_constant()) {
if (obj == nullptr) {
return JVMCIENV->get_jobject(JVMCIENV->get_JavaConstant_NULL_POINTER());
}
BasicType bt = Signature::basic_type(cp->uncached_signature_ref_at(index));
BasicType bt = Signature::basic_type(cp->uncached_signature_ref_at(cp_index));
if (!is_reference_type(bt)) {
if (!is_java_primitive(bt)) {
return JVMCIENV->get_jobject(JVMCIENV->get_JavaConstant_ILLEGAL());
Expand Down