Mercurial > hg > truffle

diff src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @ 1000:a1423fe86a18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 09 Oct 2009 15:18:52 -0700
parents 7a102acc9f17 148e5441d916
children 323bd24c6520
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Fri Oct 02 11:26:25 2009 -0700
+++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Fri Oct 09 15:18:52 2009 -0700
@@ -994,7 +994,7 @@
   LIR_Opr len = length.result();
   BasicType elem_type = x->elt_type();
 
-  __ oop2reg(ciTypeArrayKlass::make(elem_type)->encoding(), klass_reg);
+  __ oop2reg(ciTypeArrayKlass::make(elem_type)->constant_encoding(), klass_reg);
 
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
   __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);