From 6cd32023394a6f99b8e8618de3e28c9bba4ce163 Mon Sep 17 00:00:00 2001 From: Carol Eidt Date: Wed, 18 Jan 2017 12:39:29 -0800 Subject: Fix consumeReg order for ArrOffs on arm64 The change in operand order for GenTreeArrOffs was not reflected in code generation for arm64. This fixes that. --- src/jit/codegenarm64.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jit/codegenarm64.cpp b/src/jit/codegenarm64.cpp index 10f80f5c1c..585038b1b9 100644 --- a/src/jit/codegenarm64.cpp +++ b/src/jit/codegenarm64.cpp @@ -3953,14 +3953,14 @@ void CodeGen::genCodeForArrOffset(GenTreeArrOffs* arrOffset) if (!offsetNode->IsIntegralConst(0)) { - emitter* emit = getEmitter(); - GenTreePtr arrObj = arrOffset->gtArrObj; - regNumber arrReg = genConsumeReg(arrObj); - noway_assert(arrReg != REG_NA); + emitter* emit = getEmitter(); regNumber offsetReg = genConsumeReg(offsetNode); noway_assert(offsetReg != REG_NA); regNumber indexReg = genConsumeReg(indexNode); noway_assert(indexReg != REG_NA); + GenTreePtr arrObj = arrOffset->gtArrObj; + regNumber arrReg = genConsumeReg(arrObj); + noway_assert(arrReg != REG_NA); regMaskTP tmpRegMask = arrOffset->gtRsvdRegs; regNumber tmpReg = genRegNumFromMask(tmpRegMask); noway_assert(tmpReg != REG_NA); -- cgit v1.2.3