Mercurial > hg > truffle
changeset 1377:ef74d6d1ac1e
6938026: C2 compiler fails in Node::rematerialize()const
Reviewed-by: twisti
author | never |
---|---|
date | Wed, 14 Apr 2010 15:30:13 -0700 |
parents | fc3cd2277dc7 |
children | 9f5b60a14736 f9271ff9d324 a9584793da0f |
files | src/share/vm/opto/parse1.cpp |
diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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); }