Fix for openjdk/jdk#10038

Author: caizixian

mmtk/Cargo.toml

@@ -17,7 +17,7 @@ lto = true
 [package.metadata.openjdk]
 # Our CI matches the following line and extract mmtk/openjdk. If this line is updated, please check ci yaml files and make sure it works.
 openjdk_repo = "https://github.com/caizixian/jdk-mmtk.git"
-openjdk_version = "9efdbe4fe8cc1b7e5dc6afc157bcbe11f295af44"
+openjdk_version = "76137004ff56ee00198a9fc9a060dee72464e39b"
 
 [dependencies]
 libc = "0.2"

openjdk/share/mmtkBarrierSetC2.cpp

@@ -47,7 +47,8 @@ void MMTkBarrierSetC2::expand_allocate(PhaseMacroExpand* x,
                                        AllocateNode* alloc, // allocation node to be expanded
                                        Node* length,  // array length for an array allocation
                                        const TypeFunc* slow_call_type, // Type of slow call
-                                       address slow_call_address) {  // Address of slow call
+                                       address slow_call_address,
+                                       Node* valid_length_test) {  // Address of slow call
   Node* ctrl = alloc->in(TypeFunc::Control);
   Node* mem  = alloc->in(TypeFunc::Memory);
   Node* i_o  = alloc->in(TypeFunc::I_O);
@@ -465,6 +466,12 @@ void MMTkBarrierSetC2::expand_allocate(PhaseMacroExpand* x,
   // Copy debug information and adjust JVMState information, then replace
   // allocate node with the call
   call->copy_call_debug_info(&(x->_igvn), (SafePointNode*) alloc);
+  // For array allocations, copy the valid length check to the call node so Compile::final_graph_reshaping() can verify
+  // that the call has the expected number of CatchProj nodes (in case the allocation always fails and the fallthrough
+  // path dies).
+  if (valid_length_test != NULL) {
+    call->add_req(valid_length_test);
+  }
   if (!always_slow) {
     call->set_cnt(PROB_UNLIKELY_MAG(4));  // Same effect as RC_UNCOMMON.
   } else {

openjdk/share/mmtkBarrierSetC2.hpp

@@ -101,7 +101,8 @@ class MMTkBarrierSetC2: public BarrierSetC2 {
                               AllocateNode* alloc, // allocation node to be expanded
                               Node* length,  // array length for an array allocation
                               const TypeFunc* slow_call_type, // Type of slow call
-                              address slow_call_address);  // Address of slow call
+                              address slow_call_address,  // Address of slow call
+                              Node* valid_length_test); // whether length is valid or not
 };
 
 class MMTkIdealKit: public IdealKit {