diff --git a/src/share/vm/opto/escape.cpp b/src/share/vm/opto/escape.cpp
index f29f82b35390c4b46c3310b16c58112b0436a4e2..96f0011b3b2e1311aeda3c7c012f64f1cbf2f333 100644
--- a/src/share/vm/opto/escape.cpp
+++ b/src/share/vm/opto/escape.cpp
@@ -2202,7 +2202,7 @@ Node* ConnectionGraph::get_addp_base(Node *addp) {
     int opcode = uncast_base->Opcode();
     assert(opcode == Op_ConP || opcode == Op_ThreadLocal ||
            opcode == Op_CastX2P || uncast_base->is_DecodeNarrowPtr() ||
-           (uncast_base->is_Mem() && uncast_base->bottom_type() == TypeRawPtr::NOTNULL) ||
+           (uncast_base->is_Mem() && (uncast_base->bottom_type()->isa_rawptr() != NULL)) ||
            (uncast_base->is_Proj() && uncast_base->in(0)->is_Allocate()), "sanity");
   }
   return base;