summaryrefslogtreecommitdiff
path: root/src/jit/jit.h
diff options
context:
space:
mode:
authordotnet-bot <dotnet-bot@microsoft.com>2016-02-25 11:41:31 -0800
committerdotnet-bot <dotnet-bot@microsoft.com>2016-02-25 11:41:31 -0800
commit8ce6630f106425cf6064cfbb7f633af39b3c7973 (patch)
treee3f2ed0cd3448128dba3eacc6f6c21a65a08b506 /src/jit/jit.h
parent97545d6f772546e4737c112007d687c6fbc640b4 (diff)
downloadcoreclr-8ce6630f106425cf6064cfbb7f633af39b3c7973.tar.gz
coreclr-8ce6630f106425cf6064cfbb7f633af39b3c7973.tar.bz2
coreclr-8ce6630f106425cf6064cfbb7f633af39b3c7973.zip
Roll back change 1578859 on behalf of pagavlin. Change broke SuperPMI.
[tfs-changeset: 1578925]
Diffstat (limited to 'src/jit/jit.h')
-rw-r--r--src/jit/jit.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/jit/jit.h b/src/jit/jit.h
index 2b7fdf1357..af78504aa0 100644
--- a/src/jit/jit.h
+++ b/src/jit/jit.h
@@ -199,18 +199,6 @@
#define __PLACEMENT_NEW_INLINE // don't bring in the global placement new, it is easy to make a mistake
// with our new(compiler*) pattern.
-#if COR_JIT_EE_VER > 460
-#define NO_CLRCONFIG // Don't bring in the usual CLRConfig infrastructure, since the JIT uses the JIT/EE
- // interface to retrieve config values.
-
-// This is needed for contract.inl when FEATURE_STACK_PROBE is enabled.
-struct CLRConfig
-{
- static struct ConfigKey { } EXTERNAL_NO_SO_NOT_MAINLINE;
- static DWORD GetConfigValue(const ConfigKey& key) { return 0; }
-};
-#endif
-
#include "utilcode.h" // this defines assert as _ASSERTE
#include "host.h" // this redefines assert for the JIT to use assertAbort
#include "utils.h"
@@ -532,7 +520,8 @@ extern JitOptions jitOpts;
template<typename T>
inline T UninitializedWord()
{
- __int64 word = 0x0101010101010101LL * (JitConfig.JitDefaultFill() & 0xFF);
+ static ConfigDWORD fDefaultFill;
+ __int64 word = 0x0101010101010101LL * (fDefaultFill.val(CLRConfig::INTERNAL_JitDefaultFill) & 0xFF);
return (T)word;
}