Skip to content

8318694: [JVMCI] disable can_call_java in most contexts for libjvmci compiler threads #16383

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

8318694: [JVMCI] disable can_call_java in most contexts for libjvmci compiler threads #16383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9fc5ad9
[skip ci] update CompilerThread::can_call_java to be false more often…
dougxc Oct 24, 2023
7f2285e
CompilerThreadCanCallJava scope must enclose the JVMCIEnv scope
dougxc Oct 27, 2023
af42062
improved error message
dougxc Oct 27, 2023
0370178
removed unused method: JVMCIRuntime::get_field_by_index
dougxc Oct 29, 2023
a646620
avoid class loading in HotSpotConstantPool.lookupField if current thr…
dougxc Oct 29, 2023
b7181d7
allow JavaCalls in HotSpotConstantPool.callSystemExit
dougxc Oct 29, 2023
832a591
convert assertions about can_call_java to guarantees
dougxc Nov 1, 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
4 changes: 2 additions & 2 deletions src/hotspot/share/classfile/systemDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
InstanceKlass* loaded_class = nullptr;
SymbolHandle superclassname; // Keep alive while loading in parallel thread.

assert(THREAD->can_call_java(),
guarantee(THREAD->can_call_java(),
"can not load classes with compiler thread: class=%s, classloader=%s",
name->as_C_string(),
class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string());
Expand Down Expand Up @@ -2056,7 +2056,7 @@ Method* SystemDictionary::find_method_handle_invoker(Klass* klass,
Klass* accessing_klass,
Handle* appendix_result,
TRAPS) {
assert(THREAD->can_call_java() ,"");
guarantee(THREAD->can_call_java(), "");
Handle method_type =
SystemDictionary::find_method_handle_type(signature, accessing_klass, CHECK_NULL);

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/prims/upcallLinker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ JavaThread* UpcallLinker::on_entry(UpcallStub::FrameData* context, jobject recei
guarantee(thread->thread_state() == _thread_in_native, "wrong thread state for upcall");
context->thread = thread;

assert(thread->can_call_java(), "must be able to call Java");
guarantee(thread->can_call_java(), "must be able to call Java");

// Allocate handle block for Java code. This must be done before we change thread_state to _thread_in_Java,
// since it can potentially block.
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ public JavaField lookupField(int rawIndex, ResolvedJavaMethod method, int opcode
final int holderIndex = getKlassRefIndexAt(rawIndex, opcode);
JavaType fieldHolder = lookupType(holderIndex, opcode);

if (fieldHolder instanceof HotSpotResolvedObjectTypeImpl) {
if (fieldHolder instanceof HotSpotResolvedObjectTypeImpl) {
int[] info = new int[4];
HotSpotResolvedObjectTypeImpl resolvedHolder;
try {
Expand Down