From 91ec3b8392eb1962b2d01a844cb2c0bf9ecd7ffd Mon Sep 17 00:00:00 2001 From: Carol Eidt Date: Fri, 27 May 2016 18:20:11 -0700 Subject: [PATCH] Fix a build break due to PR #5101 The declaration, definition and uses of eeGetMethodFullName didn't match. --- src/jit/compiler.cpp | 2 +- src/jit/eeinterface.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp index fc34013..ac886ff 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 372e624..e383862 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) + /*****************************************************************************/ -- 2.7.4