Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authornever
Thu, 24 Feb 2011 14:49:34 -0800
changeset 8493 c865bf427f0e
parent 8492 e93bfdd91c63 (current diff)
parent 8491 058b35a9d008 (diff)
child 8494 4258c78226d9
Merge
--- 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,
jdk-sandbox