Merge pull request #1188 from dotnet-bot/from-tfs

Merge changes from TFS

2 files changed, 6 insertions, 13 deletions

diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h
index e3d6137ef1..4ba119e461 100644
--- a/src/inc/clrconfigvalues.h
+++ b/src/inc/clrconfigvalues.h
@@ -527,8 +527,6 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitELTHookEnabled, W("JitELTHookEnabled"), 0,
 CONFIG_DWORD_INFO_EX(INTERNAL_JitComponentUnitTests, W("JitComponentUnitTests"), 0, "Run JIT component unit tests", CLRConfig::REGUTIL_default)
 CONFIG_DWORD_INFO_EX(INTERNAL_JitMemStats, W("JitMemStats"), 0, "Display JIT memory usage statistics", CLRConfig::REGUTIL_default)
 CONFIG_DWORD_INFO_EX(INTERNAL_JitLoopHoistStats, W("JitLoopHoistStats"), 0, "Display JIT loop hoisting statistics", CLRConfig::REGUTIL_default)
-// JBTODO: remove.  This is temporary.
-RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitOldLoopHoist, W("JitOldLoopHoist"), 0, "Use old form of loop hoisting.")
 CONFIG_DWORD_INFO_EX(INTERNAL_JitDebugLogLoopCloning, W("JitDebugLogLoopCloning"), 0, "In debug builds log places where loop cloning optimizations are performed on the fast path.", CLRConfig::REGUTIL_default);
 CONFIG_DWORD_INFO_EX(INTERNAL_JitVNMapSelLimit, W("JitVNMapSelLimit"), 0, "If non-zero, assert if # of VNF_MapSelect applications considered reaches this", CLRConfig::REGUTIL_default)
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitVNMapSelBudget, W("JitVNMapSelBudget"), 100, "Max # of MapSelect's considered for a particular top-level invocation.")
@@ -549,6 +547,8 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_MultiCoreJitProfileWriteDelay, W("MultiCoreJit
 
 #endif
 
+CONFIG_DWORD_INFO(INTERNAL_JitFunctionTrace, W("JitFunctionTrace"), 0, "If non-zero, print JIT start/end logging")
+
 //
 // JIT64
 //
@@ -1147,7 +1147,6 @@ CONFIG_DWORD_INFO_DIRECT_ACCESS(INTERNAL_VerifierOff, W("VerifierOff"), "")
 RETAIL_CONFIG_DWORD_INFO_DIRECT_ACCESS(EXTERNAL_VerifyAllOnLoad, W("VerifyAllOnLoad"), "")
 RETAIL_CONFIG_STRING_INFO_DIRECT_ACCESS(INTERNAL_Version, W("Version"), "Version of CLR to load.")
 RETAIL_CONFIG_STRING_INFO_DIRECT_ACCESS(INTERNAL_ShimHookLibrary, W("ShimHookLibrary"), "Path to a DLL that should be notified when shim loads the runtime DLL.")
-RETAIL_CONFIG_DWORD_INFO(EXTERNAL_SOCExtraSpew, W("SOCExtraSpew"), 0, "If true, print some extra logging information that some devs find useful")
 // **
 // PLEASE MOVE ANY CONFIG SWITCH YOU OWN OUT OF THIS SECTION INTO A CATEGORY ABOVE
 // 
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
index cce10dc003..9d3c872fc3 100644
--- a/src/jit/compiler.cpp
+++ b/src/jit/compiler.cpp
@@ -2992,7 +2992,7 @@ void                 Compiler::compCompile(void * * methodCodePtr,
                                            unsigned compileFlags)
 {
     hashBv::Init(this);
-    
+
     VarSetOps::AssignAllowUninitRhs(this, compCurLife, VarSetOps::UninitVal());
 
     /* The temp holding the secret stub argument is used by fgImport() when importing the intrinsic. */
@@ -3007,22 +3007,18 @@ void                 Compiler::compCompile(void * * methodCodePtr,
     EndPhase(PHASE_PRE_IMPORT);
 
 #ifdef DEBUG
-#ifdef _TARGET_ARM_
-    bool extraSpew = (CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_SOCExtraSpew) != 0);
-#endif
+    bool funcTrace = (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_JitFunctionTrace) != 0);
 
     if (!compIsForInlining())
     {
         LONG newJitNestingLevel = InterlockedIncrement(&Compiler::jitNestingLevel);
         assert(newJitNestingLevel > 0);
-#ifdef _TARGET_ARM_
-        if (extraSpew && !opts.disDiffable)
+        if (funcTrace && !opts.disDiffable)
         {
             for (LONG i = 0; i < newJitNestingLevel - 1; i++)
                 printf("  ");
             printf("{ Start Jitting %s\n", info.compFullName); /* } editor brace matching workaround for this printf */
         }
-#endif // _TARGET_ARM
     }
 #endif // DEBUG
 
@@ -3464,8 +3460,7 @@ void                 Compiler::compCompile(void * * methodCodePtr,
     LONG newJitNestingLevel = InterlockedDecrement(&Compiler::jitNestingLevel);
     assert(newJitNestingLevel >= 0);
 
-#ifdef _TARGET_ARM_
-    if (extraSpew && !opts.disDiffable)
+    if (funcTrace && !opts.disDiffable)
     {
         for (LONG i = 0; i < newJitNestingLevel; i++)
             printf("  ");
@@ -3474,7 +3469,6 @@ void                 Compiler::compCompile(void * * methodCodePtr,
                Compiler::jitTotalMethodCompiled, DBG_ADDR(*methodCodePtr),
                info.compFullName, *methodCodeSize);
     }
-#endif // _TARGET_ARM_
 
 #if FUNC_INFO_LOGGING
     if (compJitFuncInfoFile != NULL)