changeset 8493:c865bf427f0e

Merge
author never
date Thu, 24 Feb 2011 14:49:34 -0800
parents e93bfdd91c63 058b35a9d008
children 4258c78226d9
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/memnode.cpp	Thu Feb 24 11:09:16 2011 -0800
+++ b/hotspot/src/share/vm/opto/memnode.cpp	Thu Feb 24 14:49:34 2011 -0800
@@ -4077,6 +4077,7 @@
     n = base_memory();
     assert(Node::in_dump()
            || n == NULL || n->bottom_type() == Type::TOP
+           || n->adr_type() == NULL // address is TOP
            || n->adr_type() == TypePtr::BOTTOM
            || n->adr_type() == TypeRawPtr::BOTTOM
            || Compile::current()->AliasLevel() == 0,