From: mvstanton@chromium.org Date: Wed, 6 Mar 2013 15:11:27 +0000 (+0000) Subject: Arm fix: incorrect register used in CompareObjectType X-Git-Tag: upstream/4.7.83~14938 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=940ed0dc929fd4dab8ae2822748a9bd6afa02bf9;p=platform%2Fupstream%2Fv8.git Arm fix: incorrect register used in CompareObjectType R=verwaest@chromium.org BUG= Review URL: https://codereview.chromium.org/12532002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13841 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc index 466c890..a122800 100644 --- a/src/arm/builtins-arm.cc +++ b/src/arm/builtins-arm.cc @@ -554,7 +554,7 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) { __ ldr(r3, FieldMemOperand(r1, JSFunction::kPrototypeOrInitialMapOffset)); __ tst(r3, Operand(kSmiTagMask)); __ Assert(ne, "Unexpected initial map for Array function"); - __ CompareObjectType(r1, r3, r4, MAP_TYPE); + __ CompareObjectType(r3, r3, r4, MAP_TYPE); __ Assert(eq, "Unexpected initial map for Array function"); if (FLAG_optimize_constructed_arrays) { diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc index 433d3c3..320dcc4 100644 --- a/src/mips/builtins-mips.cc +++ b/src/mips/builtins-mips.cc @@ -568,7 +568,7 @@ void Builtins::Generate_ArrayConstructCode(MacroAssembler* masm) { __ And(t0, a3, Operand(kSmiTagMask)); __ Assert(ne, "Unexpected initial map for Array function (3)", t0, Operand(zero_reg)); - __ GetObjectType(a1, a3, t0); + __ GetObjectType(a3, a3, t0); __ Assert(eq, "Unexpected initial map for Array function (4)", t0, Operand(MAP_TYPE));