# HG changeset patch
# User never
# Date 1298587774 28800
# Node ID 8190d4b75e09a02dbbdf4361fca6719e71cefb52
# Parent  6f3746e69a78d5952c0eec506a3760422cbcedc3# Parent  5a41a201d08c54225532a30ef95f14ec99e5a561
Merge

diff -r 6f3746e69a78 -r 8190d4b75e09 src/share/vm/opto/memnode.cpp
--- a/src/share/vm/opto/memnode.cpp	Thu Feb 24 11:09:16 2011 -0800
+++ b/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,