changeset 1878:f264f4c42799

7000491: assert(false) failed: should be optimized out in SharedRuntime::g1_wb_pre Summary: Wrong value type is used for NULL store when clearing the detail message of the preallocated exception object. Reviewed-by: never, iveresov
author kvn
date Thu, 18 Nov 2010 09:52:48 -0800
parents 22ef3370343b
children 4110c3e0c50d
files src/share/vm/opto/graphKit.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp	Tue Nov 16 15:57:16 2010 -0800
+++ b/src/share/vm/opto/graphKit.cpp	Thu Nov 18 09:52:48 2010 -0800
@@ -569,7 +569,8 @@
       const TypePtr* adr_typ = ex_con->add_offset(offset);
 
       Node *adr = basic_plus_adr(ex_node, ex_node, offset);
-      Node *store = store_oop_to_object(control(), ex_node, adr, adr_typ, null(), ex_con, T_OBJECT);
+      const TypeOopPtr* val_type = TypeOopPtr::make_from_klass(env()->String_klass());
+      Node *store = store_oop_to_object(control(), ex_node, adr, adr_typ, null(), val_type, T_OBJECT);
 
       add_exception_state(make_exception_state(ex_node));
       return;