Minor changes to make it easier to sync diagnostic repo copy (#107066)

* Minor changes to make it easier to sync diagnostic repo copy

* Undo ELF.h changes.

Author: Mike McLaughlin

src/coreclr/gc/gcdesc.h

@@ -160,9 +160,9 @@ class CGCDesc
     {
         // If it doesn't contain pointers, there isn't a GCDesc
         PTR_MethodTable mt(pMT);
-
+#ifndef SOS_INCLUDE
         _ASSERTE(mt->ContainsGCPointers());
-
+#endif
         return PTR_CGCDesc(mt);
     }
 

src/coreclr/gcdump/gcdump.cpp

@@ -10,9 +10,9 @@
  * to the standard code-manager spec.
  */
 
-#ifndef TARGET_UNIX
+#if !defined(TARGET_UNIX) && !defined(SOS_INCLUDE)
 #include "utilcode.h"           // For _ASSERTE()
-#endif //!TARGET_UNIX
+#endif
 #include "gcdump.h"
 
 /*****************************************************************************/

src/coreclr/gcdump/gcdumpnonx86.cpp

@@ -104,6 +104,7 @@ PCSTR GetRegName (UINT32 regnum)
     case 29: return "s6";
     case 30: return "s7";
     case 31: return "s8";
+    case 32: return "pc";
     }
 
     return "???";
@@ -142,6 +143,7 @@ PCSTR GetRegName (UINT32 regnum)
     case 29: return "t4";
     case 30: return "t5";
     case 31: return "t6";
+    case 32: return "pc";
     }
 
     return "???";

src/coreclr/gcdump/i386/gcdumpx86.cpp

@@ -8,9 +8,9 @@
 #ifdef TARGET_X86
 /*****************************************************************************/
 
-#ifndef TARGET_UNIX
+#if !defined(TARGET_UNIX) && !defined(SOS_INCLUDE)
 #include "utilcode.h"           // For _ASSERTE()
-#endif //!TARGET_UNIX
+#endif
 #include "gcdump.h"
 
 
@@ -834,10 +834,7 @@ size_t              GCDump::DumpGCTable(PTR_CBYTE      table,
 
                     if (callPndTab)
                     {
-#if defined(_DEBUG) && !defined(STRIKE)
-                // note: _ASSERTE is a no-op for strike
                         PTR_CBYTE offsStart = table;
-#endif
                         gcPrintf(" argOffs(%d) =", callPndTabCnt);
                         for (unsigned i=0; i < callPndTabCnt; i++)
                         {

src/coreclr/gcinfo/gcinfodumper.cpp

@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#ifndef SOS_INCLUDE
 #include "common.h"
+#endif
 #include "gcinfodumper.h"
 #include "gcinfodecoder.h"
 

src/coreclr/inc/arrayholder.h

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma once
+
 template <class T>
 class ArrayHolder
 {

src/coreclr/inc/gcinfodumper.h

@@ -8,9 +8,10 @@
 #include "gcinfodecoder.h"
 
 // *****************************************************************************
-// WARNING!!!: These values and code are also used by SOS in the diagnostics
-// repo. Should updated in a backwards and forwards compatible way.
+// WARNING!!!: These values and code are used in the runtime repo and SOS in the 
+// diagnostics repo. Should updated in a backwards and forwards compatible way.
 // See: https://github.com/dotnet/diagnostics/blob/main/src/shared/inc/gcinfodumper.h
+//      https://github.com/dotnet/runtime/blob/main/src/coreclr/inc/gcinfodumper.h
 // *****************************************************************************
 
 //

src/coreclr/inc/gcinfotypes.h

@@ -14,9 +14,10 @@
 #endif // _MSC_VER
 
 // *****************************************************************************
-// WARNING!!!: These values and code are also used by SOS in the diagnostics
-// repo. Should updated in a backwards and forwards compatible way.
+// WARNING!!!: These values and code are used in the runtime repo and SOS in the 
+// diagnostics repo. Should updated in a backwards and forwards compatible way.
 // See: https://github.com/dotnet/diagnostics/blob/main/src/shared/inc/gcinfotypes.h
+//      https://github.com/dotnet/runtime/blob/main/src/coreclr/inc/gcinfotypes.h
 // *****************************************************************************
 
 #define PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED

src/coreclr/inc/holder.h

@@ -909,8 +909,10 @@ FORCEINLINE void DoTheRelease(TYPE *value)
 template<typename _TYPE>
 using DoNothingHolder = SpecializedWrapper<_TYPE, DoNothing<_TYPE*>>;
 
+#ifndef SOS_INCLUDE
 template<typename _TYPE>
 using ReleaseHolder = SpecializedWrapper<_TYPE, DoTheRelease<_TYPE>>;
+#endif // SOS_INCLUDE
 
 template<typename _TYPE>
 using NonVMComHolder = SpecializedWrapper<_TYPE, DoTheRelease<_TYPE>>;

src/coreclr/inc/metahost.idl

@@ -60,6 +60,9 @@ cpp_quote("EXTERN_GUID(IID_ICLRDebuggingLibraryProvider, 0x3151c08d, 0x4d09, 0x4
 // IID ICLRDebuggingLibraryProvider2 interface : uuid{E04E2FF1-DCFD-45D5-BCD1-16FFF2FAF7BA}
 cpp_quote("EXTERN_GUID(IID_ICLRDebuggingLibraryProvider2, 0xE04E2FF1, 0xDCFD, 0x45D5, 0xBC, 0xD1, 0x16, 0xFF, 0xF2, 0xFA, 0xF7, 0xBA);")
 
+// IID ICLRDebuggingLibraryProvider3 interface : uuid{DE3AAB18-46A0-48B4-BF0D-2C336E69EA1B}
+cpp_quote("EXTERN_GUID(IID_ICLRDebuggingLibraryProvider3, 0xde3aab18, 0x46a0, 0x48b4, 0xbf, 0xd, 0x2c, 0x33, 0x6e, 0x69, 0xea, 0x1b);")
+
 // For use in ICLRMetaHost::RequestRuntimeLoadedNotification
 interface ICLRRuntimeInfo;
 
@@ -71,6 +74,13 @@ typedef void (__stdcall *RuntimeLoadedCallbackFnPtr)(
     CallbackThreadSetFnPtr    pfnCallbackThreadSet,
     CallbackThreadUnsetFnPtr  pfnCallbackThreadUnset);
 
+typedef enum 
+{
+    UnknownIndex = 0,
+    Identity = 1,
+    Runtime = 2,
+} LIBRARY_PROVIDER_INDEX_TYPE;
+
 /**************************************************************************************
  ** ICLRMetaHost                                                                     **
  ** Activated using mscoree!CLRCreateInstance. Does not do any policy decisions, get **
@@ -290,6 +300,104 @@ interface ICLRDebuggingLibraryProvider2 : IUnknown
         [out] LPWSTR* ppResolvedModulePath);
 }
 
+ /**************************************************************************************
+ ** ICLRDebuggingLibraryProvider3                                                     **
+ ** Implemented by API user                                                           **
+ ** This interface allows the debugger to provide module paths which are needed for   **
+ ** debugging a particular CLR such as mscordbi and mscordacwks.                      **
+ **************************************************************************************/
+[
+    uuid(DE3AAB18-46A0-48B4-BF0D-2C336E69EA1B),
+    version(1.0),
+    helpstring("CLR debugging LibraryProvider callback interface"),
+    local
+]
+interface ICLRDebuggingLibraryProvider3 : IUnknown
+{
+    /**********************************************************************************
+    ** The goal of this method is to allow the debugger to provide a module path     **
+    ** which is needed for debugging. The debugger may use any available means to    **
+    ** locate and/or procure the module. See the security note below for important   **
+    ** information about implementing this method securely.                          **
+    ** Arguments:                                                                    **
+    ** pwzFileName - The name of the module being requested                          **
+    **                                                                               **
+    ** pwszRuntimeModule - The runtime module path or the module path of the         **
+    **                     single-file app. NULL when called from the                **
+    **                     OpenVirtualProcess API.                                   **
+    **                                                                               **
+    ** indexType - The type of time stamp/file size is either the identity of the    **
+    **             requested module or the runtime (coreclr) module's.               **
+    **                                                                               **
+    ** dwTimeStamp - The date time stamp stored in the COFF file header of PE files  **
+    **                                                                               **
+    ** dwSizeOfImage - The SizeOfImage field stored in the COFF optional file header **
+    **                 of PE files                                                   **
+    **                                                                               **
+    ** ppResolvedModulePath - Where *ppResolvedModulePath is a null terminated       **
+    **                        path to the module dll. On Windows it should be        **
+    **                        allocated with CoTaskMemAlloc. On Unix it should be    **
+    **                        allocated with malloc. Failure leave it untouched. See **
+    **                        security note below!                                   **
+    **                                                                               **
+    ** Return value - S_OK if the module was provided, or any other convenient       **
+    **                error HRESULT if the module could not be provided              **
+    **                                                                               **
+    **                               !!!!!!!!!!!!!!                                  **
+    ** SECURITY NOTE: Anything the caller would not be willing to execute itself, it **
+    ** should not provide to the this API call                                       **
+    ***********************************************************************************/
+    HRESULT ProvideWindowsLibrary(
+        [in] const WCHAR* pwszFileName,
+        [in] const WCHAR* pwszRuntimeModule,
+        [in] LIBRARY_PROVIDER_INDEX_TYPE indexType,
+        [in] DWORD dwTimestamp,
+        [in] DWORD dwSizeOfImage,
+        [out] LPWSTR* ppResolvedModulePath);
+
+    /**********************************************************************************
+    ** The goal of this method is to allow the debugger to provide a module path     **
+    ** which is needed for debugging. The debugger may use any available means to    **
+    ** locate and/or procure the module. See the security note below for important   **
+    ** information about implementing this method securely.                          **
+    ** Arguments:                                                                    **
+    ** pwszFileName - The name of the module being requested                         **
+    **                                                                               **
+    ** pwszRuntimeModule - The runtime module path or the module path of the         **
+    **                     single-file app. NULL when called from the                **
+    **                     OpenVirtualProcess API.                                   **
+    **                                                                               **
+    ** indexType - The type of the build id either the identity of the requested     **
+    **             module or the runtime (coreclr) module's. Normally it will        **
+    **             be the identity index type and the runtime index for Linux        **
+    **             cross-DAC on Windows or for non-singlefile apps on Linux/MacOS.   **
+    **                                                                               **
+    ** pbBuildId - The Linux or MacOS module build id                                **
+    **                                                                               **
+    ** iBuildIdSize - The number of bytes in the build id                            **
+    **                                                                               **
+    ** ppResolvedModulePath - Where *ppResolvedModulePath is a null terminated       **
+    **                        path to the module dll. On Windows it should be        **
+    **                        allocated with CoTaskMemAlloc. On Unix it should be    **
+    **                        allocated with malloc. Failure leave it untouched. See **
+    **                        security note below!                                   **
+    **                                                                               **
+    ** Return value - S_OK if the module was provided, or any other convenient       **
+    **                error HRESULT if the module could not be provided              **
+    **                                                                               **
+    **                               !!!!!!!!!!!!!!                                  **
+    ** SECURITY NOTE: Anything the caller would not be willing to execute itself, it **
+    ** should not provide to the this API call                                       **
+    ***********************************************************************************/
+    HRESULT ProvideUnixLibrary(
+        [in] const WCHAR* pwszFileName,
+        [in] const WCHAR* pwszRuntimeModule,
+        [in] LIBRARY_PROVIDER_INDEX_TYPE indexType,
+        [in] BYTE* pbBuildId,
+        [in] int iBuildIdSize,
+        [out] LPWSTR* ppResolvedModulePath);
+}
+
 /**************************************************************************************
  ** ICLRDebugging                                                                    **
  ** Activated using mscoree!CLRCreateInstance.                                       **

src/coreclr/inc/stresslog.h

@@ -17,9 +17,10 @@
    extension (eg. strike). There is no memory allocation system calls etc to purtub things */
 
 // ******************************************************************************
-// WARNING!!!: These classes are used by SOS in the diagnostics repo. Values should
-// added or removed in a backwards and forwards compatible way.
+// WARNING!!!: These classes are used by the runtime and SOS in the diagnostics 
+// repo. Values should added or removed in a backwards and forwards compatible way.
 // See: https://github.com/dotnet/diagnostics/blob/main/src/shared/inc/stresslog.h
+//      https://github.com/dotnet/runtime/blob/main/src/coreclr/inc/stresslog.h
 // Parser: https://github.com/dotnet/diagnostics/blob/main/src/SOS/Strike/stressLogDump.cpp
 // ******************************************************************************
 

src/coreclr/pal/prebuilt/idl/metahost_i.cpp

@@ -0,0 +1,92 @@
+
+
+/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
+
+/* link this file in with the server and any clients */
+
+
+ /* File created by MIDL compiler version 8.01.0628 */
+/* Compiler settings for metahost.idl:
+    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+/* @@MIDL_FILE_HEADING(  ) */
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifdef _MIDL_USE_GUIDDEF_
+
+#ifndef INITGUID
+#define INITGUID
+#include <guiddef.h>
+#undef INITGUID
+#else
+#include <guiddef.h>
+#endif
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
+
+#else // !_MIDL_USE_GUIDDEF_
+
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
+
+typedef struct _IID
+{
+    unsigned long x;
+    unsigned short s1;
+    unsigned short s2;
+    unsigned char  c[8];
+} IID;
+
+#endif // __IID_DEFINED__
+
+#ifndef CLSID_DEFINED
+#define CLSID_DEFINED
+typedef IID CLSID;
+#endif // CLSID_DEFINED
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+#endif // !_MIDL_USE_GUIDDEF_
+
+MIDL_DEFINE_GUID(IID, IID_ICLRMetaHost,0xD332DB9E,0xB9B3,0x4125,0x82,0x07,0xA1,0x48,0x84,0xF5,0x32,0x16);
+
+
+MIDL_DEFINE_GUID(IID, IID_ICLRDebuggingLibraryProvider,0x3151C08D,0x4D09,0x4f9b,0x88,0x38,0x28,0x80,0xBF,0x18,0xFE,0x51);
+
+
+MIDL_DEFINE_GUID(IID, IID_ICLRDebuggingLibraryProvider2,0xE04E2FF1,0xDCFD,0x45D5,0xBC,0xD1,0x16,0xFF,0xF2,0xFA,0xF7,0xBA);
+
+
+MIDL_DEFINE_GUID(IID, IID_ICLRDebuggingLibraryProvider3,0xDE3AAB18,0x46A0,0x48B4,0xBF,0x0D,0x2C,0x33,0x6E,0x69,0xEA,0x1B);
+
+
+MIDL_DEFINE_GUID(IID, IID_ICLRDebugging,0xD28F3C5A,0x9634,0x4206,0xA5,0x09,0x47,0x75,0x52,0xEE,0xFB,0x10);
+
+
+MIDL_DEFINE_GUID(IID, IID_ICLRRuntimeInfo,0xBD39D1D2,0xBA2F,0x486a,0x89,0xB0,0xB4,0xB0,0xCB,0x46,0x68,0x91);
+
+#undef MIDL_DEFINE_GUID
+
+#ifdef __cplusplus
+}
+#endif
+
+
+