1.1 --- a/src/share/vm/opto/generateOptoStub.cpp Thu Nov 07 11:47:11 2013 +0100
1.2 +++ b/src/share/vm/opto/generateOptoStub.cpp Fri Nov 15 11:05:32 2013 -0800
1.3 @@ -104,13 +104,12 @@
1.4 //
1.5 Node *adr_sp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_sp_offset()));
1.6 Node *last_sp = basic_plus_adr(top(), frameptr(), (intptr_t) STACK_BIAS);
1.7 - store_to_memory(NULL, adr_sp, last_sp, T_ADDRESS, NoAlias);
1.8 + store_to_memory(NULL, adr_sp, last_sp, T_ADDRESS, NoAlias, MemNode::unordered);
1.9
1.10 // Set _thread_in_native
1.11 // The order of stores into TLS is critical! Setting _thread_in_native MUST
1.12 // be last, because a GC is allowed at any time after setting it and the GC
1.13 // will require last_Java_pc and last_Java_sp.
1.14 - Node* adr_state = basic_plus_adr(top(), thread, in_bytes(JavaThread::thread_state_offset()));
1.15
1.16 //-----------------------------
1.17 // Compute signature for C call. Varies from the Java signature!
1.18 @@ -225,16 +224,15 @@
1.19 //-----------------------------
1.20
1.21 // Clear last_Java_sp
1.22 - store_to_memory(NULL, adr_sp, null(), T_ADDRESS, NoAlias);
1.23 + store_to_memory(NULL, adr_sp, null(), T_ADDRESS, NoAlias, MemNode::unordered);
1.24 // Clear last_Java_pc and (optionally)_flags
1.25 - store_to_memory(NULL, adr_last_Java_pc, null(), T_ADDRESS, NoAlias);
1.26 + store_to_memory(NULL, adr_last_Java_pc, null(), T_ADDRESS, NoAlias, MemNode::unordered);
1.27 #if defined(SPARC)
1.28 - store_to_memory(NULL, adr_flags, intcon(0), T_INT, NoAlias);
1.29 + store_to_memory(NULL, adr_flags, intcon(0), T_INT, NoAlias, MemNode::unordered);
1.30 #endif /* defined(SPARC) */
1.31 #if (defined(IA64) && !defined(AIX))
1.32 Node* adr_last_Java_fp = basic_plus_adr(top(), thread, in_bytes(JavaThread::last_Java_fp_offset()));
1.33 - if( os::is_MP() ) insert_mem_bar(Op_MemBarRelease);
1.34 - store_to_memory(NULL, adr_last_Java_fp, null(), T_ADDRESS, NoAlias);
1.35 + store_to_memory(NULL, adr_last_Java_fp, null(), T_ADDRESS, NoAlias, MemNode::unordered);
1.36 #endif
1.37
1.38 // For is-fancy-jump, the C-return value is also the branch target
1.39 @@ -242,16 +240,16 @@
1.40 // Runtime call returning oop in TLS? Fetch it out
1.41 if( pass_tls ) {
1.42 Node* adr = basic_plus_adr(top(), thread, in_bytes(JavaThread::vm_result_offset()));
1.43 - Node* vm_result = make_load(NULL, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, false);
1.44 + Node* vm_result = make_load(NULL, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, MemNode::unordered);
1.45 map()->set_req(TypeFunc::Parms, vm_result); // vm_result passed as result
1.46 // clear thread-local-storage(tls)
1.47 - store_to_memory(NULL, adr, null(), T_ADDRESS, NoAlias);
1.48 + store_to_memory(NULL, adr, null(), T_ADDRESS, NoAlias, MemNode::unordered);
1.49 }
1.50
1.51 //-----------------------------
1.52 // check exception
1.53 Node* adr = basic_plus_adr(top(), thread, in_bytes(Thread::pending_exception_offset()));
1.54 - Node* pending = make_load(NULL, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, false);
1.55 + Node* pending = make_load(NULL, adr, TypeOopPtr::BOTTOM, T_OBJECT, NoAlias, MemNode::unordered);
1.56
1.57 Node* exit_memory = reset_memory();
1.58
