# HG changeset patch
# User kvn
# Date 1298572100 28800
# Node ID 5a41a201d08c54225532a30ef95f14ec99e5a561
# Parent  d411927672ed6c672361dda34d560c807f405c68
6812217: Base memory of MergeMem node violates assert during killing expanded AllocateArray node
Summary: The assert in MergeMemNode::memory_at() misses the case when address is TOP.
Reviewed-by: never

diff -r d411927672ed -r 5a41a201d08c src/share/vm/opto/memnode.cpp
--- a/src/share/vm/opto/memnode.cpp	Wed Feb 23 19:09:16 2011 -0800
+++ b/src/share/vm/opto/memnode.cpp	Thu Feb 24 10:28:20 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,