Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/parse1.cpp @ 1543:1a1603f975b5
Merge
author | kvn |
---|---|
date | Wed, 19 May 2010 10:22:39 -0700 |
parents | ef74d6d1ac1e |
children | c18cbe5936b8 |
line wrap: on
line diff
--- a/src/share/vm/opto/parse1.cpp Mon Apr 05 10:17:15 2010 -0700 +++ b/src/share/vm/opto/parse1.cpp Wed May 19 10:22:39 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); }