--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp	Thu Sep 27 16:25:25 2018 +0200
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp	Fri Sep 28 10:42:40 2018 +0200
@@ -598,6 +598,7 @@
   ac->set_clonebasic();
   Node* n = kit->gvn().transform(ac);
   if (n == ac) {
+    ac->_adr_type = TypeRawPtr::BOTTOM;
     kit->set_predefined_output_for_runtime_call(ac, ac->in(TypeFunc::Memory), raw_adr_type);
   } else {
     kit->set_all_memory(n);