--- a/src/hotspot/share/opto/library_call.cpp	Thu Mar 21 22:37:36 2019 +0100
+++ b/src/hotspot/share/opto/library_call.cpp	Fri Mar 15 09:57:42 2019 +0100
@@ -2407,7 +2407,7 @@
   }
 
   // Can base be NULL? Otherwise, always on-heap access.
-  bool can_access_non_heap = TypePtr::NULL_PTR->higher_equal(_gvn.type(heap_base_oop));
+  bool can_access_non_heap = TypePtr::NULL_PTR->higher_equal(_gvn.type(base));
 
   if (!can_access_non_heap) {
     decorators |= IN_HEAP;