--- old/src/hotspot/share/opto/phaseX.cpp	2019-09-11 16:32:53.000000000 +0200
+++ new/src/hotspot/share/opto/phaseX.cpp	2019-09-11 16:32:48.000000000 +0200
@@ -1750,6 +1750,15 @@
     }
 
     BarrierSet::barrier_set()->barrier_set_c2()->igvn_add_users_to_worklist(this, use);
+    if (use->is_Region()) {
+      Node* c = use;
+      do {
+        c = c->unique_ctrl_out();
+      } while (c != NULL && c->is_Region());
+      if (c != NULL && c->is_CallStaticJava() && c->as_CallStaticJava()->uncommon_trap_request() != 0) {
+        _worklist.push(c);
+      }
+    }
   }
 }