6938026: C2 compiler fails in Node::rematerialize()const
authornever
Wed, 14 Apr 2010 15:30:13 -0700
changeset 5333 bb01e3adecb4
parent 5255 42a063a20c3f
child 5334 b2d040a8d375
child 5335 4319cb12ddfe
child 5337 7fb3b1e7ccd3
6938026: C2 compiler fails in Node::rematerialize()const Reviewed-by: twisti
hotspot/src/share/vm/opto/parse1.cpp
--- a/hotspot/src/share/vm/opto/parse1.cpp	Tue Apr 13 13:01:37 2010 -0700
+++ b/hotspot/src/share/vm/opto/parse1.cpp	Wed Apr 14 15:30:13 2010 -0700
@@ -280,7 +280,13 @@
       continue;
     }
     // Construct code to access the appropriate local.
-    Node *value = fetch_interpreter_state(index, type->basic_type(), locals_addr, osr_buf);
+    BasicType bt = type->basic_type();
+    if (type == TypePtr::NULL_PTR) {
+      // Ptr types are mixed together with T_ADDRESS but NULL is
+      // really for T_OBJECT types so correct it.
+      bt = T_OBJECT;
+    }
+    Node *value = fetch_interpreter_state(index, bt, locals_addr, osr_buf);
     set_local(index, value);
   }