From 89ce316d5268b6798d7ca2fcf1935e70b11859e1 Mon Sep 17 00:00:00 2001 From: Mikhail Skvortcov Date: Mon, 30 Jan 2017 11:03:46 +0300 Subject: [PATCH] RyuJIT/ARM32: enable call lowering Commit migrated from https://github.com/dotnet/coreclr/commit/705deb129db2c10318cd1ff8d792b056f3f05a85 --- src/coreclr/src/jit/lower.cpp | 4 ---- src/coreclr/src/jit/lsraarm.cpp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/coreclr/src/jit/lower.cpp b/src/coreclr/src/jit/lower.cpp index 0316a34..b3a674e 100644 --- a/src/coreclr/src/jit/lower.cpp +++ b/src/coreclr/src/jit/lower.cpp @@ -1187,9 +1187,6 @@ void Lowering::LowerCall(GenTree* node) LowerArgsForCall(call); -// RyuJIT arm is not set up for lowered call control -#ifndef _TARGET_ARM_ - // note that everything generated from this point on runs AFTER the outgoing args are placed GenTree* result = nullptr; @@ -1294,7 +1291,6 @@ void Lowering::LowerCall(GenTree* node) call->gtControlExpr = result; } -#endif //!_TARGET_ARM_ if (comp->opts.IsJit64Compat()) { diff --git a/src/coreclr/src/jit/lsraarm.cpp b/src/coreclr/src/jit/lsraarm.cpp index 57f0096..99d6a32 100644 --- a/src/coreclr/src/jit/lsraarm.cpp +++ b/src/coreclr/src/jit/lsraarm.cpp @@ -595,6 +595,11 @@ void Lowering::TreeNodeInfoInitCall(GenTreeCall* call) { NYI_ARM("float reg varargs"); } + + if (call->NeedsNullCheck()) + { + info->internalIntCount++; + } } //------------------------------------------------------------------------ -- 2.7.4