Mercurial > hg > truffle

diff src/share/vm/opto/machnode.cpp @ 10279:70120f47d403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8014189: JVM crash with SEGV in ConnectionGraph::record_for_escape_analysis() Summary: Add NULL checks and asserts for Type::make_ptr() returned value. Reviewed-by: twisti
author kvn
date Thu, 09 May 2013 17:28:04 -0700
parents a7114d3d712e
children 190899198332
line wrap: on
line diff
--- a/src/share/vm/opto/machnode.cpp	Wed May 08 15:08:01 2013 -0700
+++ b/src/share/vm/opto/machnode.cpp	Thu May 09 17:28:04 2013 -0700
@@ -349,11 +349,11 @@
   if (base == NodeSentinel)  return TypePtr::BOTTOM;
 
   const Type* t = base->bottom_type();
-  if (UseCompressedOops && Universe::narrow_oop_shift() == 0) {
+  if (t->isa_narrowoop() && Universe::narrow_oop_shift() == 0) {
     // 32-bit unscaled narrow oop can be the base of any address expression
     t = t->make_ptr();
   }
-  if (UseCompressedKlassPointers && Universe::narrow_klass_shift() == 0) {
+  if (t->isa_narrowklass() && Universe::narrow_klass_shift() == 0) {
     // 32-bit unscaled narrow oop can be the base of any address expression
     t = t->make_ptr();
   }