# HG changeset patch
# User never
# Date 1271284213 25200
# Node ID ef74d6d1ac1e45c50d448d45497e376f76e74181
# Parent  fc3cd2277dc77b41ae89ca16d33201f0bd80aa0e
6938026: C2 compiler fails in Node::rematerialize()const
Reviewed-by: twisti

diff -r fc3cd2277dc7 -r ef74d6d1ac1e src/share/vm/opto/parse1.cpp
--- a/src/share/vm/opto/parse1.cpp	Tue Apr 13 13:01:37 2010 -0700
+++ b/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);
   }