Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Merge changes from TFS #1188

Merged
merged 1 commit into from
Jun 30, 2015
Merged

Merge changes from TFS #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/inc/clrconfigvalues.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand All @@ -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
//
Expand Down Expand Up @@ -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
//
Expand Down
14 changes: 4 additions & 10 deletions src/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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

Expand Down Expand Up @@ -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(" ");
Expand All @@ -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)
Expand Down