Clean up string literal implicit const casting and some two-phase lookup nits on...

* Remove implicit c-string const casting and clean up some C++ standards conformance bugs.

* Fix const string conversion in FCSigCheck.

Commit migrated from https://github.com/dotnet/coreclr/commit/bd5cc690bca0c798952b14b989ad1bf8e8f00011

diff --git a/src/coreclr/src/inc/contract.h b/src/coreclr/src/inc/contract.h
index dd66d2a..e24b2e9 100644 (file)
--- a/src/coreclr/src/inc/contract.h
+++ b/src/coreclr/src/inc/contract.h
@@ -1137,7 +1137,7 @@ class BaseContract
         }
     }
 
-    void DoChecks(UINT testmask, __in_z const char *szFunction, __in_z char *szFile, int lineNum);
+    void DoChecks(UINT testmask, __in_z const char *szFunction, __in_z const char *szFile, int lineNum);
     void Disable()
     {
     }
@@ -1380,8 +1380,9 @@ typedef __SafeToUsePostCondition __PostConditionOK;
     Contract::Returner<_returntype> ___returner(RETVAL);                \
     Contract::RanPostconditions ___ran(__FUNCTION__);                   \
     Contract::Operation ___op = Contract::Setup;                        \
+    BOOL ___contract_enabled = FALSE;                                   \
     DEBUG_ASSURE_NO_RETURN_BEGIN(CONTRACT)                              \
-    BOOL ___contract_enabled = Contract::EnforceContract();             \
+    ___contract_enabled = Contract::EnforceContract();                  \
     enum {___disabled = 0};                                             \
     if (!___contract_enabled)                                           \
         ___contract.Disable();                                          \
@@ -1897,7 +1898,7 @@ public:
     DEBUG_NOINLINE ~AutoCleanupContractViolationHolder()
     {
         SCAN_SCOPE_END;
-        LeaveInternal();
+        this->LeaveInternal();
     };
 };
 

diff --git a/src/coreclr/src/inc/contract.inl b/src/coreclr/src/inc/contract.inl
index ff165cf..6a96c18 100644 (file)
--- a/src/coreclr/src/inc/contract.inl
+++ b/src/coreclr/src/inc/contract.inl
@@ -40,7 +40,7 @@ void SoTolerantViolationHelper(const char *szFunction,
 #endif
 
 
-inline void BaseContract::DoChecks(UINT testmask, __in_z const char *szFunction, __in_z char *szFile, int lineNum)
+inline void BaseContract::DoChecks(UINT testmask, __in_z const char *szFunction, __in_z const char *szFile, int lineNum)
 {
     STATIC_CONTRACT_DEBUG_ONLY;
     STATIC_CONTRACT_NOTHROW;

diff --git a/src/coreclr/src/inc/shash.inl b/src/coreclr/src/inc/shash.inl
index f48899a..76a5b8c 100644 (file)
--- a/src/coreclr/src/inc/shash.inl
+++ b/src/coreclr/src/inc/shash.inl
@@ -403,7 +403,7 @@ SHash<TRAITS>::AllocateNewTable(count_t requestedSize, count_t * pcNewTableSize)
         GC_NOTRIGGER;
         INSTANCE_CHECK;
         PRECONDITION(requestedSize >= 
-                     (count_t) (GetCount() * s_density_factor_denominator / s_density_factor_numerator));
+                     (count_t) (GetCount() * TRAITS::s_density_factor_denominator / TRAITS::s_density_factor_numerator));
     }
     CONTRACT_END;
 
@@ -434,7 +434,7 @@ SHash<TRAITS>::ReplaceTable(element_t * newTable, count_t newTableSize)
         GC_NOTRIGGER;
         INSTANCE_CHECK;
         PRECONDITION(newTableSize >= 
-                     (count_t) (GetCount() * s_density_factor_denominator / s_density_factor_numerator));
+                     (count_t) (GetCount() * TRAITS::s_density_factor_denominator / TRAITS::s_density_factor_numerator));
     }
     CONTRACT_END;
     

diff --git a/src/coreclr/src/jit/unwind.h b/src/coreclr/src/jit/unwind.h
index c74ee2d..a78df32 100644 (file)
--- a/src/coreclr/src/jit/unwind.h
+++ b/src/coreclr/src/jit/unwind.h
@@ -95,7 +95,7 @@ protected:
         return uwiComp->dspOffset(o);
     }
 
-    static char* dspBool(bool b)
+    static const char* dspBool(bool b)
     {
         return (b) ? "true" : "false";
     }

diff --git a/src/coreclr/src/pal/tools/windows-compiler-override.txt b/src/coreclr/src/pal/tools/windows-compiler-override.txt
index f6cb168..8ed5c5b 100644 (file)
--- a/src/coreclr/src/pal/tools/windows-compiler-override.txt
+++ b/src/coreclr/src/pal/tools/windows-compiler-override.txt
@@ -1,10 +1,10 @@
-SET (CMAKE_C_FLAGS_INIT                "/Wall /FC")
+SET (CMAKE_C_FLAGS_INIT                "/Wall /FC /Zc:strictStrings")
 SET (CMAKE_C_FLAGS_DEBUG_INIT          "/Od /Zi")
 SET (CLR_C_FLAGS_CHECKED_INIT          "/O1 /Zi")
 SET (CMAKE_C_FLAGS_RELEASE_INIT        "/Ox /Zi")
 SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi")
 
-SET (CMAKE_CXX_FLAGS_INIT                "/Wall /FC")
+SET (CMAKE_CXX_FLAGS_INIT                "/Wall /FC /Zc:strictStrings")
 SET (CMAKE_CXX_FLAGS_DEBUG_INIT          "/Od /Zi")
 SET (CLR_CXX_FLAGS_CHECKED_INIT          "/O1 /Zi")
 SET (CMAKE_CXX_FLAGS_RELEASE_INIT        "/Ox /Zi")
@@ -13,4 +13,4 @@ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi")
 SET (CLR_DEFINES_DEBUG_INIT              DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1)
 SET (CLR_DEFINES_CHECKED_INIT            DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1)
 SET (CLR_DEFINES_RELEASE_INIT            NDEBUG URTBLDENV_FRIENDLY=Retail)
-SET (CLR_DEFINES_RELWITHDEBINFO_INIT     NDEBUG URTBLDENV_FRIENDLY=Retail)
\ No newline at end of file
+SET (CLR_DEFINES_RELWITHDEBINFO_INIT     NDEBUG URTBLDENV_FRIENDLY=Retail)

diff --git a/src/coreclr/src/utilcode/debug.cpp b/src/coreclr/src/utilcode/debug.cpp
index a19e7a4..943d7a3 100644 (file)
--- a/src/coreclr/src/utilcode/debug.cpp
+++ b/src/coreclr/src/utilcode/debug.cpp
@@ -284,7 +284,7 @@ BOOL LaunchJITDebugger()
         STARTUPINFO StartupInfo;
         memset(&StartupInfo, 0, sizeof(StartupInfo));
         StartupInfo.cb = sizeof(StartupInfo);
-        StartupInfo.lpDesktop = W("Winsta0\\Default");
+        StartupInfo.lpDesktop = const_cast<LPWSTR>(W("Winsta0\\Default"));
 
         PROCESS_INFORMATION ProcessInformation;
         if (WszCreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0, NULL, NULL, &StartupInfo, &ProcessInformation))

diff --git a/src/coreclr/src/utilcode/winfix.cpp b/src/coreclr/src/utilcode/winfix.cpp
index bea212d..ea18130 100644 (file)
--- a/src/coreclr/src/utilcode/winfix.cpp
+++ b/src/coreclr/src/utilcode/winfix.cpp
@@ -52,7 +52,7 @@ static BOOL gWinWrapperContractRecursionBreak = FALSE;
 class WinWrapperContract
 {
     public:
-        WinWrapperContract(char *szFunction, char *szFile, int lineNum)
+        WinWrapperContract(const char *szFunction, const char *szFile, int lineNum)
         {
             CANNOT_HAVE_CONTRACT;
 

diff --git a/src/coreclr/src/vm/appdomain.cpp b/src/coreclr/src/vm/appdomain.cpp
index 6233094..7b47735 100644 (file)
--- a/src/coreclr/src/vm/appdomain.cpp
+++ b/src/coreclr/src/vm/appdomain.cpp
@@ -6125,7 +6125,7 @@ LPCWSTR AppDomain::GetFriendlyName(BOOL fDebuggerCares/*=TRUE*/)
 
 LPCWSTR AppDomain::GetFriendlyNameForLogging()
 {
-    CONTRACT(LPWSTR)
+    CONTRACT(LPCWSTR)
     {
         NOTHROW;
         GC_NOTRIGGER;

diff --git a/src/coreclr/src/vm/binder.cpp b/src/coreclr/src/vm/binder.cpp
index 6a60712..128fcec 100644 (file)
--- a/src/coreclr/src/vm/binder.cpp
+++ b/src/coreclr/src/vm/binder.cpp
@@ -646,7 +646,7 @@ static void FCallCheckSignature(MethodDesc* pMD, PCODE pImpl)
 {
     STANDARD_VM_CONTRACT;
 
-    char* pUnmanagedSig = NULL;
+    const char* pUnmanagedSig = NULL;
 
     FCSigCheck* pSigCheck = FCSigCheck::g_pFCSigCheck;
     while (pSigCheck != NULL)
@@ -661,7 +661,7 @@ static void FCallCheckSignature(MethodDesc* pMD, PCODE pImpl)
     MetaSig msig(pMD);   
     int argIndex = -2; // start with return value
     int enregisteredArguments = 0;
-    char* pUnmanagedArg = pUnmanagedSig;
+    const char* pUnmanagedArg = pUnmanagedSig;
     for (;;)
     {
         CorElementType argType = ELEMENT_TYPE_END;
@@ -755,9 +755,9 @@ static void FCallCheckSignature(MethodDesc* pMD, PCODE pImpl)
                 ("Unexpected end of managed fcall signature\n"
                 "Method: %s:%s\n", pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName));
 
-            char* pUnmanagedArgEnd = strchr(pUnmanagedArg, ',');
+            const char* pUnmanagedArgEnd = strchr(pUnmanagedArg, ',');
 
-            char* pUnmanagedTypeEnd = (pUnmanagedArgEnd != NULL) ? 
+            const char* pUnmanagedTypeEnd = (pUnmanagedArgEnd != NULL) ? 
                 pUnmanagedArgEnd : (pUnmanagedArg + strlen(pUnmanagedArg));
 
             if (argIndex != -2)

diff --git a/src/coreclr/src/vm/eecontract.cpp b/src/coreclr/src/vm/eecontract.cpp
index 4cb31de..2d5212e 100644 (file)
--- a/src/coreclr/src/vm/eecontract.cpp
+++ b/src/coreclr/src/vm/eecontract.cpp
@@ -23,7 +23,7 @@ void EEContract::Disable()
     BaseContract::Disable();
 }
 
-void EEContract::DoChecks(UINT testmask, __in_z const char *szFunction, __in_z char *szFile, int lineNum)
+void EEContract::DoChecks(UINT testmask, __in_z const char *szFunction, __in_z const char *szFile, int lineNum)
 {
     SCAN_IGNORE_THROW;      // Tell the static contract analyzer to ignore contract violations
     SCAN_IGNORE_FAULT;      // due to the contract checking logic itself.

diff --git a/src/coreclr/src/vm/eecontract.h b/src/coreclr/src/vm/eecontract.h
index 3b7f160..fbe0d55 100644 (file)
--- a/src/coreclr/src/vm/eecontract.h
+++ b/src/coreclr/src/vm/eecontract.h
@@ -42,7 +42,7 @@ class EEContract : public BaseContract
     }
 
     void Disable();
-    void DoChecks(UINT testmask, __in_z const char *szFunction, __in_z char *szFile, int lineNum);
+    void DoChecks(UINT testmask, __in_z const char *szFunction, __in_z const char *szFile, int lineNum);
 };
 
 

diff --git a/src/coreclr/src/vm/exceptmacros.h b/src/coreclr/src/vm/exceptmacros.h
index 2af064c..8e78fc4 100644 (file)
--- a/src/coreclr/src/vm/exceptmacros.h
+++ b/src/coreclr/src/vm/exceptmacros.h
@@ -434,7 +434,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar
 #define CANNOTTHROWCOMPLUSEXCEPTION() ANNOTATION_NOTHROW; \
     COMPlusCannotThrowExceptionHelper _dummyvariable(TRUE, __FUNCTION__, __FILE__, __LINE__);
 
-extern char *g_ExceptionFile;
+extern const char *g_ExceptionFile;
 extern DWORD g_ExceptionLine;
 
 #define THROWLOG() ( g_ExceptionFile = __FILE__, g_ExceptionLine = __LINE__, TRUE )

diff --git a/src/coreclr/src/vm/fcall.h b/src/coreclr/src/vm/fcall.h
index e7465ba..1cf4241 100644 (file)
--- a/src/coreclr/src/vm/fcall.h
+++ b/src/coreclr/src/vm/fcall.h
@@ -967,7 +967,7 @@ extern int FC_NO_TAILCALL;
 #ifdef CHECK_FCALL_SIGNATURE
 struct FCSigCheck {
 public:
-    FCSigCheck(void* fnc, char* sig)
+    FCSigCheck(void* fnc, const char* sig)
     {
         LIMITED_METHOD_CONTRACT;
         func = fnc;
@@ -978,7 +978,7 @@ public:
 
     FCSigCheck* next;
     void* func;
-    char* signature;
+    const char* signature;
 
     static FCSigCheck* g_pFCSigCheck;
 };

diff --git a/src/coreclr/src/vm/interoputil.cpp b/src/coreclr/src/vm/interoputil.cpp
index 8bf5842..cc3f0ec 100644 (file)
--- a/src/coreclr/src/vm/interoputil.cpp
+++ b/src/coreclr/src/vm/interoputil.cpp
@@ -6273,13 +6273,13 @@ VOID IntializeInteropLogging()
     g_TraceCount = g_pConfig->GetTraceWrapper();
 }
 
-VOID LogInterop(__in_z LPSTR szMsg)
+VOID LogInterop(__in_z LPCSTR szMsg)
 {
     LIMITED_METHOD_CONTRACT;
     LOG( (LF_INTEROP, LL_INFO10, "%s\n",szMsg) );
 }
 
-VOID LogInterop(__in_z LPWSTR wszMsg)
+VOID LogInterop(__in_z LPCWSTR wszMsg)
 {
     LIMITED_METHOD_CONTRACT;
     LOG( (LF_INTEROP, LL_INFO10, "%S\n", wszMsg) );

diff --git a/src/coreclr/src/vm/interoputil.h b/src/coreclr/src/vm/interoputil.h
index f290ba2..50abc39 100644 (file)
--- a/src/coreclr/src/vm/interoputil.h
+++ b/src/coreclr/src/vm/interoputil.h
@@ -401,8 +401,8 @@ ClassFactoryBase *GetComClassFactory(MethodTable* pClassMT);
 
 #ifdef _DEBUG
 
-VOID LogInterop(__in_z LPSTR szMsg);
-VOID LogInterop(__in_z LPWSTR szMsg);
+VOID LogInterop(__in_z LPCSTR szMsg);
+VOID LogInterop(__in_z LPCWSTR szMsg);
 
 VOID LogInteropLeak(IUnkEntry * pEntry);
 VOID LogInteropLeak(IUnknown* pItf);

diff --git a/src/coreclr/src/vm/threads.h b/src/coreclr/src/vm/threads.h
index e36e784..3aa1681 100644 (file)
--- a/src/coreclr/src/vm/threads.h
+++ b/src/coreclr/src/vm/threads.h
@@ -3622,7 +3622,7 @@ private:
     static void __stdcall RedirectedHandledJITCaseForGCThreadControl();
     static void __stdcall RedirectedHandledJITCaseForUserSuspend();
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
-    static void __stdcall Thread::RedirectedHandledJITCaseForGCStress();
+    static void __stdcall RedirectedHandledJITCaseForGCStress();
 #endif // defined(HAVE_GCCOVER) && USE_REDIRECT_FOR_GCSTRESS
 
     friend void CPFH_AdjustContextForThreadSuspensionRace(T_CONTEXT *pContext, Thread *pThread);

diff --git a/src/coreclr/src/vm/vars.cpp b/src/coreclr/src/vm/vars.cpp
index 4884449..0dbdee8 100644 (file)
--- a/src/coreclr/src/vm/vars.cpp
+++ b/src/coreclr/src/vm/vars.cpp
@@ -39,7 +39,7 @@ BBSweep              g_BBSweep;
 Volatile<LONG>       g_trtChgStamp = 0;
 Volatile<LONG>       g_trtChgInFlight = 0;
 
-char *               g_ExceptionFile;   // Source of the last thrown exception (COMPLUSThrow())
+const char *         g_ExceptionFile;   // Source of the last thrown exception (COMPLUSThrow())
 DWORD                g_ExceptionLine;   // ... ditto ...
 void *               g_ExceptionEIP;    // Managed EIP of the last guy to call JITThrow.
 #endif // _DEBUG

diff --git a/src/coreclr/src/vm/vars.hpp b/src/coreclr/src/vm/vars.hpp
index d01757d..a062f0b 100644 (file)
--- a/src/coreclr/src/vm/vars.hpp
+++ b/src/coreclr/src/vm/vars.hpp
@@ -352,7 +352,7 @@ EXTERN IBCLogger            g_IBCLogger;
 // that does not allow g_TrapReturningThreads to creep up unchecked.
 EXTERN Volatile<LONG>       g_trtChgStamp;
 EXTERN Volatile<LONG>       g_trtChgInFlight;
-EXTERN char *               g_ExceptionFile;
+EXTERN const char *         g_ExceptionFile;
 EXTERN DWORD                g_ExceptionLine;
 EXTERN void *               g_ExceptionEIP;
 #endif