summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2017-02-28 09:57:34 -0800
committerGitHub <noreply@github.com>2017-02-28 09:57:34 -0800
commit404c9fd12660a83d85f1e4ae1cafcfbb9b4c7ab0 (patch)
treedcba3a0417cbbc1f26d74c2d820e92bb784cf074
parent6d1e688cb2bd37121c7de786b118b912ce0734c7 (diff)
parentd0f6e8fd3678e6144a8421fe6df76c05d7e45ca9 (diff)
downloadcoreclr-404c9fd12660a83d85f1e4ae1cafcfbb9b4c7ab0.tar.gz
coreclr-404c9fd12660a83d85f1e4ae1cafcfbb9b4c7ab0.tar.bz2
coreclr-404c9fd12660a83d85f1e4ae1cafcfbb9b4c7ab0.zip
Merge pull request #9852 from mskvortsov/ryujit-arm32-label
[RyuJIT/ARM32] enable CG for GT_LABEL nodes
-rw-r--r--src/jit/codegenarm.cpp2
-rw-r--r--src/jit/lsraarm.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/jit/codegenarm.cpp b/src/jit/codegenarm.cpp
index ca6ae01f30..236a8650c7 100644
--- a/src/jit/codegenarm.cpp
+++ b/src/jit/codegenarm.cpp
@@ -986,7 +986,7 @@ void CodeGen::genCodeForTreeNode(GenTreePtr treeNode)
case GT_LABEL:
genPendingCallLabel = genCreateTempLabel();
treeNode->gtLabel.gtLabBB = genPendingCallLabel;
- emit->emitIns_R_L(INS_lea, EA_PTRSIZE, genPendingCallLabel, treeNode->gtRegNum);
+ emit->emitIns_J_R(INS_adr, EA_PTRSIZE, genPendingCallLabel, treeNode->gtRegNum);
break;
case GT_CLS_VAR_ADDR:
diff --git a/src/jit/lsraarm.cpp b/src/jit/lsraarm.cpp
index a347139cb4..ac06bbebf4 100644
--- a/src/jit/lsraarm.cpp
+++ b/src/jit/lsraarm.cpp
@@ -1073,6 +1073,7 @@ void Lowering::TreeNodeInfoInit(GenTree* tree)
case GT_CNS_INT:
case GT_PUTARG_REG:
case GT_PUTARG_STK:
+ case GT_LABEL:
info->dstCount = tree->IsValue() ? 1 : 0;
if (kind & (GTK_CONST | GTK_LEAF))
{