diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2021-03-29 23:58:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 23:58:50 +0300 |
| commit | d2613848efd92dfaad21499a8de81916346a3b60 (patch) | |
| tree | 60895eee4feafa1a63c57a7bb3a846282b5f7bf7 /src/coreclr/md | |
| parent | 98ace7d4837fcd81c1f040b1f67e63e9e1973e13 (diff) | |
Clean up REGUTIL/CLRConfig system (#50314)
* Convert all configuration options from REGUTIL to CLRConfig.
* Remove uses of REGUTIL outside of CLRConfig impl.
Diffstat (limited to 'src/coreclr/md')
| -rw-r--r-- | src/coreclr/md/debug_metadata.h | 2 | ||||
| -rw-r--r-- | src/coreclr/md/enc/mdinternalrw.cpp | 4 | ||||
| -rw-r--r-- | src/coreclr/md/inc/metamodel.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/coreclr/md/debug_metadata.h b/src/coreclr/md/debug_metadata.h index 7f98c4c182b..7e18e4affc0 100644 --- a/src/coreclr/md/debug_metadata.h +++ b/src/coreclr/md/debug_metadata.h @@ -60,7 +60,7 @@ #define Debug_ReportError(strMessage) \ do { \ - if (REGUTIL::GetConfigDWORD_DontUse_(CLRConfig::INTERNAL_AssertOnBadImageFormat, 0)) \ + if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_AssertOnBadImageFormat)) \ { _ASSERTE_MSG(FALSE, (strMessage)); } \ } while(0) #define Debug_ReportInternalError(strMessage) _ASSERTE_MSG(FALSE, (strMessage)) diff --git a/src/coreclr/md/enc/mdinternalrw.cpp b/src/coreclr/md/enc/mdinternalrw.cpp index 629300415ae..c051bb405fd 100644 --- a/src/coreclr/md/enc/mdinternalrw.cpp +++ b/src/coreclr/md/enc/mdinternalrw.cpp @@ -720,7 +720,7 @@ ULONG MDInternalRW::GetCountWithTokenKind( // return hresult break; default: #ifdef _DEBUG - if(REGUTIL::GetConfigDWORD_DontUse_(CLRConfig::INTERNAL_AssertOnBadImageFormat, 1)) + if(CLRConfig::GetConfigValue(CLRConfig::INTERNAL_AssertOnBadImageFormat, 1)) _ASSERTE(!"Invalid Blob Offset"); #endif ulCount = 0; @@ -2367,7 +2367,7 @@ MDInternalRW::GetSigFromToken( // not a known token type. #ifdef _DEBUG - if(REGUTIL::GetConfigDWORD_DontUse_(CLRConfig::INTERNAL_AssertOnBadImageFormat, 1)) + if(CLRConfig::GetConfigValue(CLRConfig::INTERNAL_AssertOnBadImageFormat, 1)) _ASSERTE(!"Unexpected token type"); #endif *pcbSig = 0; diff --git a/src/coreclr/md/inc/metamodel.h b/src/coreclr/md/inc/metamodel.h index a3a615fc6cd..e3206a589ad 100644 --- a/src/coreclr/md/inc/metamodel.h +++ b/src/coreclr/md/inc/metamodel.h @@ -1368,7 +1368,7 @@ public: break; case mdtString: default: - if(REGUTIL::GetConfigDWORD_DontUse_(CLRConfig::INTERNAL_AssertOnBadImageFormat, 0)) + if(CLRConfig::GetConfigValue(CLRConfig::INTERNAL_AssertOnBadImageFormat)) _ASSERTE(!"Unexpected token type in FindCustomAttributeByName"); hr = COR_E_BADIMAGEFORMAT; goto ErrExit; |