diff options
| author | Matt Ellis <matell@microsoft.com> | 2016-05-28 01:46:09 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2016-05-28 01:46:09 -0700 |
| commit | 4aa7ce273f03d242fddfbe134aa6d0144045e2da (patch) | |
| tree | 516cfdf30a485370f85c71cda15f15cded4a17d3 /src | |
| parent | d0bcc5bdec1abf608849260652c8ada30fdf597d (diff) | |
| parent | 91ec3b8392eb1962b2d01a844cb2c0bf9ecd7ffd (diff) | |
| download | coreclr-4aa7ce273f03d242fddfbe134aa6d0144045e2da.tar.gz coreclr-4aa7ce273f03d242fddfbe134aa6d0144045e2da.tar.bz2 coreclr-4aa7ce273f03d242fddfbe134aa6d0144045e2da.zip | |
Merge pull request #5299 from CarolEidt/FixArm64
Fix a build break due to PR #5101
Diffstat (limited to 'src')
| -rw-r--r-- | src/jit/compiler.cpp | 2 | ||||
| -rw-r--r-- | src/jit/eeinterface.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp index fc34013a87..ac886fff04 100644 --- a/src/jit/compiler.cpp +++ b/src/jit/compiler.cpp @@ -3926,7 +3926,7 @@ void Compiler::compCompile(void * * methodCodePtr, assert(!compIsForInlining()); #ifdef DEBUG // We only have access to info.compFullName in DEBUG builds. fprintf(compJitFuncInfoFile, "%s\n", info.compFullName); -#else +#elif FEATURE_SIMD fprintf(compJitFuncInfoFile, " %s\n", eeGetMethodFullName(info.compMethodHnd)); #endif fprintf(compJitFuncInfoFile, ""); // in our logic this causes a flush diff --git a/src/jit/eeinterface.cpp b/src/jit/eeinterface.cpp index 372e624cd2..e383862057 100644 --- a/src/jit/eeinterface.cpp +++ b/src/jit/eeinterface.cpp @@ -20,6 +20,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX #pragma hdrstop #endif +#if defined(DEBUG) || defined(FEATURE_JIT_METHOD_PERF) || defined(FEATURE_SIMD) + #pragma warning(push) #pragma warning(disable:4701) // difficult to get rid of C4701 with 'sig' below @@ -197,4 +199,6 @@ const char* Compiler::eeGetMethodFullName (CORINFO_METHOD_HANDLE hnd) #pragma warning(pop) +#endif // defined(DEBUG) || defined(FEATURE_JIT_METHOD_PERF) || defined(FEATURE_SIMD) + /*****************************************************************************/ |