Mercurial > hg > truffle
diff src/share/vm/c1/c1_LIRGenerator.cpp @ 2106:91fe28b03d6a
Merge.
| author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
|---|---|
| date | Wed, 26 Jan 2011 18:17:37 +0100 |
| parents | 06f017f7daa7 037c727f35fb |
| children | d25d4ca69222 |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp Sat Jan 22 17:31:11 2011 +0100 +++ b/src/share/vm/c1/c1_LIRGenerator.cpp Wed Jan 26 18:17:37 2011 +0100 @@ -856,7 +856,7 @@ __ cmove(lir_cond(cond), LIR_OprFact::intptrConst(taken_count_offset), LIR_OprFact::intptrConst(not_taken_count_offset), - data_offset_reg); + data_offset_reg, as_BasicType(if_instr->x()->type())); // MDO cells are intptr_t, so the data_reg width is arch-dependent. LIR_Opr data_reg = new_pointer_register(); @@ -2591,7 +2591,7 @@ LIR_Opr reg = rlock_result(x); __ cmp(lir_cond(x->cond()), left.result(), right.result()); - __ cmove(lir_cond(x->cond()), t_val.result(), f_val.result(), reg); + __ cmove(lir_cond(x->cond()), t_val.result(), f_val.result(), reg, as_BasicType(x->x()->type())); }