# HG changeset patch
# User rkennke
# Date 1562940650 -7200
#      Fri Jul 12 16:10:50 2019 +0200
# Node ID 980408838ddab4f9890acb5a1f97d1cf88557344
# Parent  d755f53becea0e8a251dbf382e12266bdffd6fd4
8227637: Adjust Shenandoah C2 verifier to recognize IN_NATIVE barriers

diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -208,7 +208,10 @@
         if (trace) {
           tty->print("Found raw LoadP (OSR argument?)");
         }
-      } else if (in->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
+      } else if (in->Opcode() == Op_ShenandoahLoadReferenceBarrier ||
+                 (in->Opcode() == Op_Proj &&
+                  in->in(0)->Opcode() == Op_CallLeaf &&
+                  strcmp(in->in(0)->as_Call()->_name, "ShenandoahRuntime::oop_load_from_native_barrier") == 0)) {
         if (t == ShenandoahOopStore) {
           uint i = 0;
           for (; i < phis.size(); i++) {
@@ -527,7 +530,7 @@
         if (!verify_helper(n->in(TypeFunc::Parms), phis, visited, ShenandoahStore, trace, barriers_used)) {
           report_verify_failure("Shenandoah verification: _fill should have barriers", n);
         }
-      } else if (!strcmp(call->_name, "shenandoah_wb_pre")) {
+      } else if (!strcmp(call->_name, "shenandoah_wb_pre") || !strcmp(call->_name, "ShenandoahRuntime::oop_load_from_native_barrier")) {
         // skip
       } else {
         const int calls_len = sizeof(calls) / sizeof(calls[0]);