Cleanup src/coreclr/src/inc/src/metadata.h (#35621)

* Cleanup src/coreclr/src/inc/src/metadata.h

Remove #include of private implementation headers
Fix build breaks

* Remove stray #undef __unaligned

diff --git a/src/coreclr/src/debug/di/module.cpp b/src/coreclr/src/debug/di/module.cpp
index 386348b..24911ba 100644 (file)
--- a/src/coreclr/src/debug/di/module.cpp
+++ b/src/coreclr/src/debug/di/module.cpp
@@ -19,6 +19,7 @@
 #include "ildbsymlib.h"
 
 #include "pedecoder.h"
+#include "stgpool.h"
 
 //---------------------------------------------------------------------------------------
 // Update an existing metadata importer with a buffer

diff --git a/src/coreclr/src/ilasm/ilasmpch.h b/src/coreclr/src/ilasm/ilasmpch.h
index 56e86c2..31be491 100644 (file)
--- a/src/coreclr/src/ilasm/ilasmpch.h
+++ b/src/coreclr/src/ilasm/ilasmpch.h
@@ -24,4 +24,7 @@
 #include "openum.h"             // for CEE_*
 #include <stdarg.h>         // for vararg macros
 
+#include "mdfileformat.h"
+#include "stgpooli.h"
+
 #endif

diff --git a/src/coreclr/src/ildasm/dasm.cpp b/src/coreclr/src/ildasm/dasm.cpp
index e329d2d..2a46f33 100644 (file)
--- a/src/coreclr/src/ildasm/dasm.cpp
+++ b/src/coreclr/src/ildasm/dasm.cpp
@@ -40,6 +40,9 @@
 DECLARE_NATIVE_STRING_RESOURCE_TABLE(NATIVE_STRING_RESOURCE_NAME);
 #endif
 
+#include "mdfileformat.h"
+
+
 struct MIDescriptor
 {
     mdToken tkClass;    // defining class token

diff --git a/src/coreclr/src/ildasm/dasm_mi.cpp b/src/coreclr/src/ildasm/dasm_mi.cpp
index f345b19..38fee07 100644 (file)
--- a/src/coreclr/src/ildasm/dasm_mi.cpp
+++ b/src/coreclr/src/ildasm/dasm_mi.cpp
@@ -4,5 +4,8 @@
 
 #include "ildasmpch.h"
 
+#include "mdfileformat.h"
+
+
 #include "../tools/metainfo/mdinfo.cpp"
 #include "../tools/metainfo/mdobj.cpp"

diff --git a/src/coreclr/src/ildasm/ildasmpch.h b/src/coreclr/src/ildasm/ildasmpch.h
index ff939ed..071bedb 100644 (file)
--- a/src/coreclr/src/ildasm/ildasmpch.h
+++ b/src/coreclr/src/ildasm/ildasmpch.h
@@ -22,4 +22,8 @@
 #include <htmlhelp.h>
 #include <conio.h>
 
+#ifndef Debug_ReportError
+#define Debug_ReportError(strMessage)
+#endif
+
 #endif

diff --git a/src/coreclr/src/md/inc/mdfileformat.h b/src/coreclr/src/inc/mdfileformat.h
similarity index 99%
rename from src/coreclr/src/md/inc/mdfileformat.h
rename to src/coreclr/src/inc/mdfileformat.h
index 8d21781..b414b0c 100644 (file)
--- a/src/coreclr/src/md/inc/mdfileformat.h
+++ b/src/coreclr/src/inc/mdfileformat.h
@@ -14,6 +14,9 @@
 #ifndef __MDFileFormat_h__
 #define __MDFileFormat_h__
 
+#include <metamodelpub.h>
+#include "utilcode.h"
+
 //*****************************************************************************
 // The signature ULONG is the first 4 bytes of the file format.  The second
 // signature string starts the header containing the stream list.  It is used

diff --git a/src/coreclr/src/inc/metadata.h b/src/coreclr/src/inc/metadata.h
index b789881..662a77e 100644 (file)
--- a/src/coreclr/src/inc/metadata.h
+++ b/src/coreclr/src/inc/metadata.h
@@ -14,9 +14,11 @@
 #ifndef _METADATA_H_
 #define _METADATA_H_
 
-#include "../md/inc/metamodelro.h"
-#include "../md/inc/liteweightstgdb.h"
+#include "ex.h"
 
+class CorProfileData;
+class IMetaModelCommon;
+class MDInternalRW;
 class UTSemReadWrite;
 
 inline int IsGlobalMethodParentTk(mdTypeDef td)
@@ -1123,8 +1125,12 @@ DECLARE_INTERFACE_(IMDInternalEmit, IUnknown)
 #ifdef FEATURE_METADATA_CUSTOM_DATA_SOURCE
 
 struct IMDCustomDataSource;
-
-#include "../md/inc/metamodel.h"
+class CMiniMdSchema;
+struct CMiniTableDef;
+namespace MetaData
+{
+    class DataBlob;
+}
 
 // {CC0C8F7A-A00B-493D-80B6-CE0C92491670}
 EXTERN_GUID(IID_IMDCustomDataSource, 0xcc0c8f7a, 0xa00b, 0x493d, 0x80, 0xb6, 0xce, 0xc, 0x92, 0x49, 0x16, 0x70);
@@ -1168,6 +1174,37 @@ struct ICorDebugDataTarget;
 HRESULT CreateRemoteMDInternalRWSource(TADDR mdInternalRWRemoteAddress, ICorDebugDataTarget* pDataTarget, DWORD defines, DWORD dataStructureVersion, IMDCustomDataSource** ppDataSource);
 #endif
 
+enum MetaDataReorderingOptions {
+    NoReordering=0x0,
+    ReArrangeStringPool=0x1
+};
+
+#ifdef FEATURE_PREJIT
+
+// {0702E333-8D64-4ca7-B564-4AA56B1FCEA3}
+EXTERN_GUID(IID_IMetaDataCorProfileData, 0x702e333, 0x8d64, 0x4ca7, 0xb5, 0x64, 0x4a, 0xa5, 0x6b, 0x1f, 0xce, 0xa3 );
+
+#undef  INTERFACE
+#define INTERFACE IMetaDataCorProfileData
+DECLARE_INTERFACE_(IMetaDataCorProfileData, IUnknown)
+{
+    STDMETHOD(SetCorProfileData)(
+        CorProfileData *pProfileData) PURE;         // [IN] Pointer to profile data
+};
+
+// {2B464817-C0F6-454e-99E7-C352D8384D7B}
+EXTERN_GUID(IID_IMDInternalMetadataReorderingOptions, 0x2B464817, 0xC0F6, 0x454e, 0x99, 0xE7, 0xC3, 0x52, 0xD8, 0x38, 0x4D, 0x7B );
+
+#undef  INTERFACE
+#define INTERFACE IMDInternalMetadataReorderingOptions
+DECLARE_INTERFACE_(IMDInternalMetadataReorderingOptions, IUnknown)
+{
+    STDMETHOD(SetMetaDataReorderingOptions)(
+        MetaDataReorderingOptions options) PURE;         // [IN] metadata reordering options
+};
+
+#endif //FEATURE_PREJIT
+
 #ifdef __HOLDER_H_
 
 void DECLSPEC_NORETURN ThrowHR(HRESULT hr);

diff --git a/src/coreclr/src/inc/metamodelpub.h b/src/coreclr/src/inc/metamodelpub.h
index 0762598..83cc9c6 100644 (file)
--- a/src/coreclr/src/inc/metamodelpub.h
+++ b/src/coreclr/src/inc/metamodelpub.h
@@ -16,7 +16,8 @@
 #endif
 
 #include <cor.h>
-#include <stgpool.h>
+#include "contract.h"
+
 
 #ifndef lengthof
 # define lengthof(x) (sizeof(x)/sizeof((x)[0]))

diff --git a/src/coreclr/src/inc/sstring.h b/src/coreclr/src/inc/sstring.h
index a045917..ec2eb0c 100644 (file)
--- a/src/coreclr/src/inc/sstring.h
+++ b/src/coreclr/src/inc/sstring.h
@@ -45,6 +45,7 @@
 
 #include "utilcode.h"
 #include "sbuffer.h"
+#include "debugmacros.h"
 
 // ==========================================================================================
 // Documentational typedefs: use these to indicate specific representations of 8 bit strings:

diff --git a/src/coreclr/src/inc/stgpool.h b/src/coreclr/src/inc/stgpool.h
index f86354b..d9a84c3 100644 (file)
--- a/src/coreclr/src/inc/stgpool.h
+++ b/src/coreclr/src/inc/stgpool.h
@@ -30,8 +30,6 @@
 #include "memoryrange.h"
 #include "../md/hotdata/hotheap.h"
 
-#include "../md/debug_metadata.h"
-
 //*****************************************************************************
 // NOTE:
 // One limitation with the pools, we have no way to removing strings from

diff --git a/src/coreclr/src/md/compiler/stdafx.h b/src/coreclr/src/md/compiler/stdafx.h
index c1bff71..a73681d 100644 (file)
--- a/src/coreclr/src/md/compiler/stdafx.h
+++ b/src/coreclr/src/md/compiler/stdafx.h
@@ -19,6 +19,10 @@
 #include <cor.h>
 #include <corpriv.h>
 
+#include "../hotdata/hotheap.h"
+#include <metamodelro.h>
+#include <liteweightstgdb.h>
+
 #include "nsutilpriv.h"
 
 #include "utsem.h"

diff --git a/src/coreclr/src/md/datasource/stdafx.h b/src/coreclr/src/md/datasource/stdafx.h
index be8349d..61c7385 100644 (file)
--- a/src/coreclr/src/md/datasource/stdafx.h
+++ b/src/coreclr/src/md/datasource/stdafx.h
@@ -19,5 +19,8 @@
 #include <cor.h>
 #include <corpriv.h>
 
+#include <metamodelro.h>
+#include <liteweightstgdb.h>
+
 
 #endif  // __STDAFX_H_

diff --git a/src/coreclr/src/md/enc/CMakeLists.txt b/src/coreclr/src/md/enc/CMakeLists.txt
index 7220736..221bb8c 100644 (file)
--- a/src/coreclr/src/md/enc/CMakeLists.txt
+++ b/src/coreclr/src/md/enc/CMakeLists.txt
@@ -13,6 +13,7 @@ set(MDRUNTIMERW_SOURCES
 set(MDRUNTIMERW_HEADERS
   ../../inc/corhdr.h
   ../../inc/metadata.h
+  ../../inc/mdfileformat.h
   ../../inc/pedecoder.h
   ../../inc/pedecoder.inl
   ../../inc/posterror.h
@@ -22,7 +23,6 @@ set(MDRUNTIMERW_HEADERS
   ../compiler/regmeta.h
   ../hotdata/hotdataformat.h
   ../inc/liteweightstgdb.h
-  ../inc/mdfileformat.h
   ../inc/mdinternalrw.h
   ../inc/mdlog.h
   ../inc/metadatahash.h

diff --git a/src/coreclr/src/md/enc/stdafx.h b/src/coreclr/src/md/enc/stdafx.h
index 7c92404..ed91d0b 100644 (file)
--- a/src/coreclr/src/md/enc/stdafx.h
+++ b/src/coreclr/src/md/enc/stdafx.h
@@ -19,6 +19,11 @@
 #include <cor.h>
 #include <corpriv.h>
 
+#include "../hotdata/hotheap.h"
+#include <metamodelro.h>
+#include <liteweightstgdb.h>
+
+
 #include "mdcommon.h"
 
 #include "utsem.h"

diff --git a/src/coreclr/src/md/inc/liteweightstgdb.h b/src/coreclr/src/md/inc/liteweightstgdb.h
index 2e3ab20..05fd569 100644 (file)
--- a/src/coreclr/src/md/inc/liteweightstgdb.h
+++ b/src/coreclr/src/md/inc/liteweightstgdb.h
@@ -13,6 +13,7 @@
 #ifndef __LiteWeightStgdb_h__
 #define __LiteWeightStgdb_h__
 
+#include "metadata.h"
 #include "metamodelro.h"
 #include "metamodelrw.h"
 

diff --git a/src/coreclr/src/md/inc/metamodel.h b/src/coreclr/src/md/inc/metamodel.h
index 31105c0..70402a0 100644 (file)
--- a/src/coreclr/src/md/inc/metamodel.h
+++ b/src/coreclr/src/md/inc/metamodel.h
@@ -22,8 +22,6 @@
 #include "../datablob.h"
 #include "../debug_metadata.h"
 
-#undef __unaligned
-
 #define ALLOCATED_MEMORY_MARKER 0xff
 
 // Version numbers for metadata format.

diff --git a/src/coreclr/src/md/inc/metamodelrw.h b/src/coreclr/src/md/inc/metamodelrw.h
index ab10190..322e280 100644 (file)
--- a/src/coreclr/src/md/inc/metamodelrw.h
+++ b/src/coreclr/src/md/inc/metamodelrw.h
@@ -204,37 +204,6 @@ class MDInternalRW;
 class CorProfileData;
 class UTSemReadWrite;
 
-enum MetaDataReorderingOptions {
-    NoReordering=0x0,
-    ReArrangeStringPool=0x1
-};
-
-#ifdef FEATURE_PREJIT
-
-// {0702E333-8D64-4ca7-B564-4AA56B1FCEA3}
-EXTERN_GUID(IID_IMetaDataCorProfileData, 0x702e333, 0x8d64, 0x4ca7, 0xb5, 0x64, 0x4a, 0xa5, 0x6b, 0x1f, 0xce, 0xa3 );
-
-#undef  INTERFACE
-#define INTERFACE IMetaDataCorProfileData
-DECLARE_INTERFACE_(IMetaDataCorProfileData, IUnknown)
-{
-    STDMETHOD(SetCorProfileData)(
-        CorProfileData *pProfileData) PURE;         // [IN] Pointer to profile data
-};
-
-// {2B464817-C0F6-454e-99E7-C352D8384D7B}
-EXTERN_GUID(IID_IMDInternalMetadataReorderingOptions, 0x2B464817, 0xC0F6, 0x454e, 0x99, 0xE7, 0xC3, 0x52, 0xD8, 0x38, 0x4D, 0x7B );
-
-#undef  INTERFACE
-#define INTERFACE IMDInternalMetadataReorderingOptions
-DECLARE_INTERFACE_(IMDInternalMetadataReorderingOptions, IUnknown)
-{
-    STDMETHOD(SetMetaDataReorderingOptions)(
-        MetaDataReorderingOptions options) PURE;         // [IN] metadata reordering options
-};
-
-#endif //FEATURE_PREJIT
-
 template <class MiniMd> class CLiteWeightStgdb;
 //*****************************************************************************
 // Read/Write MiniMd.

diff --git a/src/coreclr/src/md/runtime/CMakeLists.txt b/src/coreclr/src/md/runtime/CMakeLists.txt
index 6dc193e..109b9f1 100644 (file)
--- a/src/coreclr/src/md/runtime/CMakeLists.txt
+++ b/src/coreclr/src/md/runtime/CMakeLists.txt
@@ -18,6 +18,7 @@ set(MDRUNTIME_HEADERS
   ../../inc/corhlpr.h
   ../../inc/corpriv.h
   ../../inc/mdcommon.h
+  ../../inc/mdfileformat.h
   ../../inc/metadatatracker.h
   ../../inc/pedecoder.h
   ../../inc/posterror.h
@@ -26,7 +27,6 @@ set(MDRUNTIME_HEADERS
   ../inc/assemblymdinternaldisp.h
   ../inc/liteweightstgdb.h
   ../inc/mdcolumndescriptors.h
-  ../inc/mdfileformat.h
   ../inc/metamodel.h
   ../inc/metamodelro.h
   ../inc/recordpool.h

diff --git a/src/coreclr/src/md/runtime/stdafx.h b/src/coreclr/src/md/runtime/stdafx.h
index 088ecb1..65decac 100644 (file)
--- a/src/coreclr/src/md/runtime/stdafx.h
+++ b/src/coreclr/src/md/runtime/stdafx.h
@@ -19,6 +19,10 @@
 #include <cor.h>
 #include <corpriv.h>
 
+#include "../hotdata/hotheap.h"
+#include <metamodelro.h>
+#include <liteweightstgdb.h>
+
 #include "mdcommon.h"
 
 #endif  // __STDAFX_H_

diff --git a/src/coreclr/src/md/winmd/stdafx.h b/src/coreclr/src/md/winmd/stdafx.h
index c1bff71..32494ed 100644 (file)
--- a/src/coreclr/src/md/winmd/stdafx.h
+++ b/src/coreclr/src/md/winmd/stdafx.h
@@ -23,4 +23,7 @@
 
 #include "utsem.h"
 
+#include <metamodelro.h>
+#include <liteweightstgdb.h>
+
 #endif  // __STDAFX_H_

diff --git a/src/coreclr/src/unwinder/stdafx.h b/src/coreclr/src/unwinder/stdafx.h
index 27b419b..5b7d4f8 100644 (file)
--- a/src/coreclr/src/unwinder/stdafx.h
+++ b/src/coreclr/src/unwinder/stdafx.h
@@ -12,6 +12,7 @@
 #define USE_COM_CONTEXT_DEF
 
 #include <common.h>
+
 #include <debugger.h>
 #include <methoditer.h>
 #ifdef DACCESS_COMPILE

diff --git a/src/coreclr/src/utilcode/util.cpp b/src/coreclr/src/utilcode/util.cpp
index c09496d..f1f004d 100644 (file)
--- a/src/coreclr/src/utilcode/util.cpp
+++ b/src/coreclr/src/utilcode/util.cpp
@@ -19,6 +19,7 @@
 #include "cor.h"
 #include "corinfo.h"
 #include "volatile.h"
+#include "mdfileformat.h"
 
 #ifndef DACCESS_COMPILE
 UINT32 g_nClrInstanceId = 0;

diff --git a/src/coreclr/src/vm/assemblyloadcontext.h b/src/coreclr/src/vm/assemblyloadcontext.h
index 85b4f30..dd6d958 100644 (file)
--- a/src/coreclr/src/vm/assemblyloadcontext.h
+++ b/src/coreclr/src/vm/assemblyloadcontext.h
@@ -6,6 +6,7 @@
 #define _ASSEMBLYLOADCONTEXT_H
 
 #include "crst.h"
+#include <sarray.h>
 
 class NativeImage;
 class Module;

diff --git a/src/coreclr/src/vm/common.h b/src/coreclr/src/vm/common.h
index fc64032..7089b75 100644 (file)
--- a/src/coreclr/src/vm/common.h
+++ b/src/coreclr/src/vm/common.h
@@ -285,6 +285,7 @@ namespace Loader
 #include "log.h"
 #include "loaderheap.h"
 #include "fixuppointer.h"
+#include "stgpool.h"
 
 // src/vm
 #include "gcenv.interlocked.h"