Reduce binary size by moving data definitions out of headers. (dotnet…

…#40254)
Jacksondr5 · Aug 10, 2020 · 4a1037b · 4a1037b
1 parent 305dde1
commit 4a1037b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/coreclr/src/debug/inc/dbgipcevents.h b/src/coreclr/src/debug/inc/dbgipcevents.h
@@ -984,25 +984,9 @@ struct MSLAYOUT IPCEventTypeNameMapping
             const char *            eventName;
 };
 
-#ifdef _MSC_VER
-extern const __declspec(selectany)
-#else
-constexpr
-#endif
-IPCEventTypeNameMapping DbgIPCEventTypeNames[] =
-{
-    #define IPC_EVENT_TYPE0(type, val)  { type, #type },
-    #define IPC_EVENT_TYPE1(type, val)  { type, #type },
-    #define IPC_EVENT_TYPE2(type, val)  { type, #type },
-    #include "dbgipceventtypes.h"
-    #undef IPC_EVENT_TYPE2
-    #undef IPC_EVENT_TYPE1
-    #undef IPC_EVENT_TYPE0
-    { DB_IPCE_INVALID_EVENT, "DB_IPCE_Error" }
-};
-
-const size_t nameCount = sizeof(DbgIPCEventTypeNames) / sizeof(DbgIPCEventTypeNames[0]);
+extern const IPCEventTypeNameMapping DbgIPCEventTypeNames[];
 
+extern const size_t nameCount;
 
 struct MSLAYOUT IPCENames // We use a class/struct so that the function can remain in a shared header file
 {
@@ -1033,7 +1017,7 @@ struct MSLAYOUT IPCENames // We use a class/struct so that the function can rema
         #undef IPC_EVENT_TYPE0
         };
 
-        unsigned int i, lim;
+        size_t i, lim;
 
         if (eventType < DB_IPCE_DEBUGGER_FIRST)
         {

diff --git a/src/coreclr/src/debug/shared/utils.cpp b/src/coreclr/src/debug/shared/utils.cpp
@@ -200,3 +200,17 @@ void ExportILToNativeMap(ULONG32 cMap,             // [in] Min size of mapExt, m
 #endif // _DEBUG
     }
 }
+
+const IPCEventTypeNameMapping DbgIPCEventTypeNames[] =
+{
+    #define IPC_EVENT_TYPE0(type, val)  { type, #type },
+    #define IPC_EVENT_TYPE1(type, val)  { type, #type },
+    #define IPC_EVENT_TYPE2(type, val)  { type, #type },
+    #include "dbgipceventtypes.h"
+    #undef IPC_EVENT_TYPE2
+    #undef IPC_EVENT_TYPE1
+    #undef IPC_EVENT_TYPE0
+    { DB_IPCE_INVALID_EVENT, "DB_IPCE_Error" }
+};
+
+const size_t nameCount = sizeof(DbgIPCEventTypeNames) / sizeof(DbgIPCEventTypeNames[0]);
diff --git a/src/coreclr/src/inc/cor.h b/src/coreclr/src/inc/cor.h
@@ -2093,7 +2093,7 @@ inline ULONG CorSigUncompressData(      // return number of bytes of that compre
 }
 
 
-constexpr mdToken g_tkCorEncodeToken[4] ={mdtTypeDef, mdtTypeRef, mdtTypeSpec, mdtBaseType};
+extern const mdToken g_tkCorEncodeToken[];
 
 // uncompress a token
 inline mdToken CorSigUncompressToken(   // return the token.

diff --git a/src/coreclr/src/utilcode/sigbuilder.cpp b/src/coreclr/src/utilcode/sigbuilder.cpp
@@ -6,6 +6,8 @@
 #include "sigbuilder.h"
 #include "ex.h"
 
+const mdToken g_tkCorEncodeToken[4] ={mdtTypeDef, mdtTypeRef, mdtTypeSpec, mdtBaseType};
+
 void SigBuilder::AppendByte(BYTE b)
 {
     STANDARD_VM_CONTRACT;