From f76e56daa03414c9544b350f098a213b355831c9 Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Thu, 24 Feb 2011 10:28:20 -0800
Subject: [PATCH] 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

---
 src/share/vm/opto/memnode.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/share/vm/opto/memnode.cpp b/src/share/vm/opto/memnode.cpp
index e3880ea4e..304e6802f 100644
--- a/src/share/vm/opto/memnode.cpp
+++ b/src/share/vm/opto/memnode.cpp
@@ -4077,6 +4077,7 @@ Node* MergeMemNode::memory_at(uint alias_idx) const {
     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,
-- 
GitLab