stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8211232: GraphKit::make_runtime_call() sometimes attaches wrong memory state to call

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Roland Westrelin 2018-09-28 14:24:22 +02:00
parent a9efcea778
commit a2d1b6b720
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/share/opto/graphKit.cpp
View File

@ -1804,12 +1804,13 @@ Node* GraphKit::set_results_for_java_call(CallJavaNode* call, bool separate_io_p
// A better answer would be to separate out card marks from other memory.
// For now, return the input memory state, so that it can be reused
// after the call, if this call has restricted memory effects.
Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call) {
Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem) {
// Set fixed predefined input arguments
Node* memory = reset_memory();
Node* m = narrow_mem == NULL ? memory : narrow_mem;
call->init_req( TypeFunc::Control, control() );
call->init_req( TypeFunc::I_O, top() ); // does no i/o
call->init_req( TypeFunc::Memory, memory ); // may gc ptrs
call->init_req( TypeFunc::Memory, m ); // may gc ptrs
call->init_req( TypeFunc::FramePtr, frameptr() );
call->init_req( TypeFunc::ReturnAdr, top() );
return memory;
@ -2465,9 +2466,7 @@ Node* GraphKit::make_runtime_call(int flags,
} else {
assert(!wide_out, "narrow in => narrow out");
Node* narrow_mem = memory(adr_type);
prev_mem = reset_memory();
map()->set_memory(narrow_mem);
set_predefined_input_for_runtime_call(call);
prev_mem = set_predefined_input_for_runtime_call(call, narrow_mem);
}
// Hook each parm in order. Stop looking at the first NULL.

2
src/hotspot/share/opto/graphKit.hpp
View File

@ -699,7 +699,7 @@ class GraphKit : public Phase {
void set_predefined_output_for_runtime_call(Node* call,
Node* keep_mem,
const TypePtr* hook_mem);
Node* set_predefined_input_for_runtime_call(SafePointNode* call);
Node* set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem = NULL);
// Replace the call with the current state of the kit. Requires
// that the call was generated with separate io_projs so that