summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarret Shook <jashoo@microsoft.com>2017-02-10 16:40:59 -0800
committerGitHub <noreply@github.com>2017-02-10 16:40:59 -0800
commit735cd1ef01946eb46293f598a030eeff33fadedd (patch)
treef9b9984957775bd30ade912783fc5af0e1718687
parent5c2459a1b4c31ca467d9a50fe76e37a4412bc872 (diff)
parent310632c37a7143f8b88811b5e4f2e82ffe1aab3e (diff)
downloadcoreclr-735cd1ef01946eb46293f598a030eeff33fadedd.tar.gz
coreclr-735cd1ef01946eb46293f598a030eeff33fadedd.tar.bz2
coreclr-735cd1ef01946eb46293f598a030eeff33fadedd.zip
Merge pull request #9499 from jashook/arm64_dyn_block_assert
ARM64 Modify genCodeForInitBlk assert
-rw-r--r--src/jit/codegenarm64.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/jit/codegenarm64.cpp b/src/jit/codegenarm64.cpp
index 71c6dd1162..48d6f76453 100644
--- a/src/jit/codegenarm64.cpp
+++ b/src/jit/codegenarm64.cpp
@@ -3378,7 +3378,14 @@ void CodeGen::genCodeForInitBlk(GenTreeBlk* initBlkNode)
assert(!dstAddr->isContained());
assert(!initVal->isContained());
- assert(initBlkNode->gtRsvdRegs == RBM_ARG_2);
+ if (initBlkNode->gtOper == GT_STORE_DYN_BLK)
+ {
+ assert(initBlkNode->AsDynBlk()->gtDynamicSize->gtRegNum == REG_ARG_2);
+ }
+ else
+ {
+ assert(initBlkNode->gtRsvdRegs == RBM_ARG_2);
+ }
// TODO-ARM64-CQ: When initblk loop unrolling is implemented
// put this assert back on.