Mercurial > hg > release > icedtea7-forest-2.5 > hotspot

changeset 4798:ad5bb04f36f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8015441: runThese crashed with assert(opcode == Op_ConP || opcode == Op_ThreadLocal || opcode == Op_CastX2P ..) failed: sanity Summary: Relax the assert to accept any raw ptr types. Reviewed-by: roland
author kvn
date Fri, 31 May 2013 13:54:47 -0700
parents b1e9bbeb81f3
children 2417fa1acf2b 973c3ede4866
files src/share/vm/opto/escape.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/escape.cpp	Wed Jun 26 20:21:16 2013 -0700
+++ b/src/share/vm/opto/escape.cpp	Fri May 31 13:54:47 2013 -0700
@@ -2162,7 +2162,7 @@
     int opcode = uncast_base->Opcode();
     assert(opcode == Op_ConP || opcode == Op_ThreadLocal ||
            opcode == Op_CastX2P || uncast_base->is_DecodeN() ||
-           (uncast_base->is_Mem() && uncast_base->bottom_type() == TypeRawPtr::NOTNULL) ||
+           (uncast_base->is_Mem() && (uncast_base->bottom_type()->isa_rawptr() != NULL)) ||
            (uncast_base->is_Proj() && uncast_base->in(0)->is_Allocate()), "sanity");
   }
   return base;