1.1 --- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -1061,11 +1061,11 @@
1.11 LIR_Opr len = length.result();
1.12
1.13 CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info);
1.14 - ciObject* obj = (ciObject*) ciObjArrayKlass::make(x->klass());
1.15 + ciKlass* obj = (ciKlass*) ciObjArrayKlass::make(x->klass());
1.16 if (obj == ciEnv::unloaded_ciobjarrayklass()) {
1.17 BAILOUT("encountered unloaded_ciobjarrayklass due to out of memory error");
1.18 }
1.19 - jobject2reg_with_patching(klass_reg, obj, patching_info);
1.20 + klass2reg_with_patching(klass_reg, obj, patching_info);
1.21 __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, T_OBJECT, klass_reg, slow_path);
1.22
1.23 LIR_Opr result = rlock_result(x);
1.24 @@ -1104,7 +1104,7 @@
1.25 }
1.26
1.27 LIR_Opr reg = result_register_for(x->type());
1.28 - jobject2reg_with_patching(reg, x->klass(), patching_info);
1.29 + klass2reg_with_patching(reg, x->klass(), patching_info);
1.30
1.31 LIR_Opr rank = FrameMap::rbx_opr;
1.32 __ move(LIR_OprFact::intConst(x->rank()), rank);
