Skip to content

Commit

Permalink
Merge pull request dotnet#14325 from dotnet-bot/from-tfs
Browse files Browse the repository at this point in the history
Merge changes from TFS
  • Loading branch information
briansull committed Oct 4, 2017
2 parents 6573823 + 4422820 commit 2de0bce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/jit/importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3762,7 +3762,7 @@ GenTreePtr Compiler::impIntrinsic(GenTreePtr newobjThis,
{
assert(retNode == nullptr);
const NamedIntrinsic ni = lookupNamedIntrinsic(method);
#ifdef _TARGET_XARCH_
#if defined(_TARGET_XARCH_) && !defined(LEGACY_BACKEND)
if (ni > NI_HW_INTRINSIC_START && ni < NI_HW_INTRINSIC_END)
{
retNode = impX86HWIntrinsic(ni, method, sig);
Expand Down Expand Up @@ -3990,7 +3990,7 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
}
}

#ifdef _TARGET_XARCH_
#if defined(_TARGET_XARCH_) && !defined(LEGACY_BACKEND)
if ((namespaceName != nullptr) && strcmp(namespaceName, "System.Runtime.Intrinsics.X86") == 0)
{
InstructionSet isa = lookupHWIntrinsicISA(className);
Expand Down

0 comments on commit 2de0bce

Please sign in to comment.