Merge branch 'main' into lazy_jsexport

Author: pavelsavara

.github/copilot-instructions.md

@@ -37,10 +37,11 @@ In addition to the rules enforced by `.editorconfig`, you SHOULD:
     - [5.1. How To: Identify Affected Libraries](#51-how-to-identify-affected-libraries)
     - [5.2. How To: Build and Test Specific Library](#52-how-to-build-and-test-specific-library)
 - [6. WebAssembly (WASM) Libraries Workflow](#6-webassembly-wasm-libraries-workflow)
-- [7. Additional Notes](#7-additional-notes)
-    - [7.1. Troubleshooting](#71-troubleshooting)
-    - [7.2. Windows Command Equivalents](#72-windows-command-equivalents)
-    - [7.3. References](#73-references)
+- [7. Host Workflow](#7-host-workflow)
+- [8. Additional Notes](#8-additional-notes)
+    - [8.1. Troubleshooting](#81-troubleshooting)
+    - [8.2. Windows Command Equivalents](#82-windows-command-equivalents)
+    - [8.3. References](#83-references)
 
 ## 1. Prerequisites
 
@@ -54,6 +55,7 @@ Identify which components will be impacted by the changes. If in doubt, analyze
 - **Mono Runtime:** Changes in `src/mono/`
 - **Libraries:** Changes in `src/libraries/`
 - **WASM/WASI Libraries:** Changes in `src/libraries/` *and* the affected library targets WASM or WASI *and* the changes are included for the target (see below for details).
+- **Host:** Changes in `src/native/corehost/`, `src/installer/managed/`, or `src/installer/tests/`
 - If none above apply, it is most possibly an infra-only or a docs-only change. Skip build and test steps.
 
 **WASM/WASI Library Change Detection**
@@ -76,6 +78,7 @@ Before applying any changes, ensure you have a full successful build of the need
     - **Mono Runtime:** `./build.sh mono+libs`
     - **Libraries:** `./build.sh clr+libs -rc release`
     - **WASM/WASI Libraries:** `./build.sh mono+libs -os browser`
+    - **Host:** `./build.sh clr+libs+host -rc release -lc release`
 
 3. Verify the build completed without error.
     - _If the baseline build failed, report the failure and don't proceed with the changes._
@@ -239,9 +242,24 @@ From the repository root:
 
 ---
 
-## 7. Additional Notes
+## 7. Host Workflow
 
-### 7.1. Troubleshooting
+From the repository root:
+
+- Build:
+  `./build.sh host -rc release -lc release`
+
+- Run all tests:
+  `./build.sh host.tests -rc release -lc release -test`
+
+- More info can be found in the dedicated workflow docs:
+    - [Building and running host tests](/docs/workflow/testing/host/testing.md)
+
+---
+
+## 8. Additional Notes
+
+### 8.1. Troubleshooting
 
 - **Shared Framework Missing**
 
@@ -273,15 +291,15 @@ From the repository root:
 
 ---
 
-### 7.2. Windows Command Equivalents
+### 8.2. Windows Command Equivalents
 
 - Use `build.cmd` instead of `build.sh` on Windows.
 - Set PATH: `set PATH=%CD%\.dotnet;%PATH%`
 - All other commands are similar unless otherwise noted.
 
 ---
 
-### 7.3. References
+### 8.3. References
 
 - [`.editorconfig`](/.editorconfig)
 - [Building CoreCLR Guide](/docs/workflow/building/coreclr/README.md)
@@ -292,3 +310,4 @@ From the repository root:
 - [Testing Libraries](/docs/workflow/testing/libraries/testing.md)
 - [Build libraries for WebAssembly](/docs/workflow/building/libraries/webassembly-instructions.md)
 - [Testing Libraries on WebAssembly](/docs/workflow/testing/libraries/testing-wasm.md)
+- [Building and running host tests](/docs/workflow/testing/host/testing.md)

docs/design/datacontracts/RuntimeTypeSystem.md

@@ -51,14 +51,18 @@ partial interface IRuntimeTypeSystem : IContract
     // True if the MethodTable represents a type that contains managed references
     public virtual bool ContainsGCPointers(TypeHandle typeHandle);
     public virtual bool IsDynamicStatics(TypeHandle typeHandle);
-    public virtual ushort GetNumMethods(TypeHandle typeHandle);
     public virtual ushort GetNumInterfaces(TypeHandle typeHandle);
 
     // Returns an ECMA-335 TypeDef table token for this type, or for its generic type definition if it is a generic instantiation
     public virtual uint GetTypeDefToken(TypeHandle typeHandle);
+    public virtual ushort GetNumMethods(TypeHandle typeHandle);
     // Returns the ECMA 335 TypeDef table Flags value (a bitmask of TypeAttributes) for this type,
     // or for its generic type definition if it is a generic instantiation
     public virtual uint GetTypeDefTypeAttributes(TypeHandle typeHandle);
+    public ushort GetNumInstanceFields(TypeHandle typeHandle);
+    public ushort GetNumStaticFields(TypeHandle typeHandle);
+    public ushort GetNumThreadStaticFields(TypeHandle typeHandle);
+    public TargetPointer GetFieldDescList(TypeHandle typeHandle);
     public virtual ReadOnlySpan<TypeHandle> GetInstantiation(TypeHandle typeHandle);
     public virtual bool IsGenericTypeDefinition(TypeHandle typeHandle);
 
@@ -348,6 +352,10 @@ The contract additionally depends on these data descriptors
 | `EEClass` | `NumMethods` | Count of methods attached to the EEClass |
 | `EEClass` | `NumNonVirtualSlots` | Count of non-virtual slots for the EEClass |
 | `EEClass` | `CorTypeAttr` | Various flags |
+| `EEClass` | `NumInstanceFields` | Count of instance fields of the EEClass |
+| `EEClass` | `NumStaticFields` | Count of static fields of the EEClass |
+| `EEClass` | `NumThreadStaticFields` | Count of threadstatic fields of the EEClass |
+| `EEClass` | `FieldDescList` | A list of fields in the type |
 | `ArrayClass` | `Rank` | Rank of the associated array MethodTable |
 | `TypeDesc` | `TypeAndFlags` | The lower 8 bits are the CorElementType of the `TypeDesc`, the upper 24 bits are reserved for flags |
 | `ParamTypeDesc` | `TypeArg` | Associated type argument |
@@ -374,11 +382,35 @@ The contract additionally depends on these data descriptors
         return TypeHandle { Address = typeHandlePointer }
     }
 
+    public TargetPointer GetModule(TypeHandle TypeHandle)
+    {
+        if (typeHandle.IsMethodTable())
+        {
+            return _methodTables[TypeHandle.Address].Module;
+        }
+        else if (typeHandle.IsTypeDesc())
+        {
+            if (HasTypeParam(typeHandle))
+            {
+                return GetModule(GetTypeParam(typeHandle));
+            }
+            else if (IsGenericVariable(typeHandle, out TargetPointer genericParamModule, out _))
+            {
+                return genericParamModule;
+            }
+        }
+        return TargetPointer.Null;
+    }
+
     internal static EEClassOrCanonMTBits GetEEClassOrCanonMTBits(TargetPointer eeClassOrCanonMTPtr)
     {
         return (EEClassOrCanonMTBits)(eeClassOrCanonMTPtr & (ulong)EEClassOrCanonMTBits.Mask);
     }
 
+    public TargetPointer GetCanonicalMethodTable(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? TargetPointer.Null : GetClassData(TypeHandle).MethodTable;
+
+    public TargetPointer GetParentMethodTable(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? TargetPointer.Null : _methodTables[TypeHandle.Address].ParentMethodTable;
+
     public uint GetBaseSize(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? (uint)0 : _methodTables[TypeHandle.Address].Flags.BaseSize;
 
     public uint GetComponentSize(TypeHandle TypeHandle) =>!typeHandle.IsMethodTable() ? (uint)0 :  GetComponentSize(_methodTables[TypeHandle.Address]);
@@ -397,36 +429,16 @@ The contract additionally depends on these data descriptors
         ... // read Data.EEClass data from eeClassPtr
     }
 
-
-    public TargetPointer GetCanonicalMethodTable(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? TargetPointer.Null : GetClassData(TypeHandle).MethodTable;
-
-    public TargetPointer GetModule(TypeHandle TypeHandle)
-    {
-        if (typeHandle.IsMethodTable())
-        {
-            return _methodTables[TypeHandle.Address].Module;
-        }
-        else if (typeHandle.IsTypeDesc())
-        {
-            if (HasTypeParam(typeHandle))
-            {
-                return GetModule(GetTypeParam(typeHandle));
-            }
-            else if (IsGenericVariable(typeHandle, out TargetPointer genericParamModule, out _))
-            {
-                return genericParamModule;
-            }
-        }
-        return TargetPointer.Null;
-    }
-
-    public TargetPointer GetParentMethodTable(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? TargetPointer.Null : _methodTables[TypeHandle.Address].ParentMethodTable;
-
     public bool IsFreeObjectMethodTable(TypeHandle TypeHandle) => FreeObjectMethodTablePointer == TypeHandle.Address;
 
     public bool IsString(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? false : _methodTables[TypeHandle.Address].Flags.IsString;
+
     public bool ContainsGCPointers(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? false : _methodTables[TypeHandle.Address].Flags.ContainsGCPointers;
 
+    public bool IsDynamicStatics(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? false : _methodTables[TypeHandle.Address].Flags.IsDynamicStatics;
+
+    public ushort GetNumInterfaces(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? 0 : _methodTables[TypeHandle.Address].NumInterfaces;
+
     public uint GetTypeDefToken(TypeHandle TypeHandle)
     {
         if (!typeHandle.IsMethodTable())
@@ -438,11 +450,15 @@ The contract additionally depends on these data descriptors
 
     public ushort GetNumMethods(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? 0 : GetClassData(TypeHandle).NumMethods;
 
-    public ushort GetNumInterfaces(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? 0 : _methodTables[TypeHandle.Address].NumInterfaces;
-
     public uint GetTypeDefTypeAttributes(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? 0 : GetClassData(TypeHandle).CorTypeAttr;
 
-    public bool IsDynamicStatics(TypeHandle TypeHandle) => !typeHandle.IsMethodTable() ? false : _methodTables[TypeHandle.Address].Flags.IsDynamicStatics;
+    public ushort GetNumInstanceFields(TypeHandle typeHandle) => !typeHandle.IsMethodTable() ? (ushort)0 : GetClassData(typeHandle).NumInstanceFields;
+
+    public ushort GetNumStaticFields(TypeHandle typeHandle) => !typeHandle.IsMethodTable() ? (ushort)0 : GetClassData(typeHandle).NumStaticFields;
+
+    public ushort GetNumThreadStaticFields(TypeHandle typeHandle) => !typeHandle.IsMethodTable() ? (ushort)0 : GetClassData(typeHandle).NumThreadStaticFields;
+
+    public TargetPointer GetFieldDescList(TypeHandle typeHandle) => !typeHandle.IsMethodTable() ? TargetPointer.Null : GetClassData(typeHandle).FieldDescList;
 
     public ReadOnlySpan<TypeHandle> GetInstantiation(TypeHandle TypeHandle)
     {

docs/design/datacontracts/debug_interface_globals.md

@@ -0,0 +1,22 @@
+# Debug Interface Globals
+
+The following document lists the global variables that are used directly in the debug interface managed code (SOSDacImpl.cs, etc.)
+
+Global variables used
+| Global Name | Type | Purpose |
+| --- | --- | --- |
+| StringMethodTable | TargetPointer | Identify where the string MethodTable exists |
+| ObjectMethodTable | TargetPointer | Identify where the object MethodTable exists |
+| SystemDomain | TargetPointer | Identify where the SystemDomain exists |
+| DirectorySeparator | TargetPointer | Identify where the directory separator exists |
+| FeatureCOMInterop | TargetPointer | Identify where the flag for FeatureCOMInterop exists |
+| StressLog | TargetPointer | Identify where the StressLog exists |
+| AppDomain | TargetPointer | Identify where the AppDomain exists |
+| ObjectArrayMethodTable | TargetPointer | Identify where the ObjectArrayMethodTable exists |
+| ExceptionMethodTable | TargetPointer | Identify where the ExceptionMethodTable exists |
+| FreeObjectMethodTable | TargetPointer | Identify where the FreeObjectMethodTable exists |
+| SOSBreakingChangeVersion | TargetPointer | Identify where the SOSBreakingChangeVersion exists |
+| DacNotificationFlags | TargetPointer | Identify where the DacNotificationFlags exists |
+| MaxClrNotificationArgs | uint32 | Identify the maximum number of CLR notification arguments |
+| ClrNotificationArguments | TargetPointer | Identify where the ClrNotificationArguments exists |
+| DefaultADID | uint | Identify the default AppDomain ID |

eng/Versions.props

@@ -28,8 +28,7 @@
     <FlagNetStandard1XDependencies Condition="'$(FlagNetStandard1XDependencies)' == ''">true</FlagNetStandard1XDependencies>
     <!-- Runtime controls its dependency graph via Traversal projects and doesn't want or need Arcade's ExcludeFrom infrastructure. -->
     <DisableArcadeExcludeFromBuildSupport>true</DisableArcadeExcludeFromBuildSupport>
-    <!-- Use SDK compilers in full VMR builds. -->
-    <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildOrchestrator)' != 'true'">true</UsingToolMicrosoftNetCompilers>
+    <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
   </PropertyGroup>
   <ItemGroup>
     <WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />

eng/build.sh

@@ -150,7 +150,7 @@ initDistroRid()
 
 showSubsetHelp()
 {
-  "$scriptroot/common/build.sh" "-restore" "-build" "/p:Subset=help" "/clp:nosummary /tl:false"
+  "$scriptroot/common/build.sh" "-restore" "-build" "/p:Subset=help" "/clp:nosummary" "/tl:false"
 }
 
 arguments=()

src/coreclr/System.Private.CoreLib/src/System/RuntimeType.CoreCLR.cs

@@ -3974,6 +3974,11 @@ internal object GetUninitializedObject()
                 throw new MissingMethodException(SR.Format(SR.Arg_NoDefCTor, this));
             }
 
+            if (IsByRefLike)
+            {
+                throw new NotSupportedException(SR.NotSupported_ByRefLike);
+            }
+
             // Compat: allocation always takes place outside the try block so that OOMs
             // bubble up to the caller; the ctor invocation is within the try block so
             // that it can be wrapped in TIE if needed.
@@ -3996,6 +4001,8 @@ internal object GetUninitializedObject()
         [DebuggerHidden]
         internal object? CreateInstanceOfT()
         {
+            Debug.Assert(!IsValueType);
+
             ActivatorCache cache = GetOrCreateCacheEntry<ActivatorCache>();
 
             if (!cache.CtorIsPublic)

src/coreclr/debug/runtimeinfo/datadescriptor.h

@@ -333,8 +333,12 @@ CDAC_TYPE_BEGIN(EEClass)
 CDAC_TYPE_INDETERMINATE(EEClass)
 CDAC_TYPE_FIELD(EEClass, /*pointer*/, MethodTable, cdac_data<EEClass>::MethodTable)
 CDAC_TYPE_FIELD(EEClass, /*uint16*/, NumMethods, cdac_data<EEClass>::NumMethods)
+CDAC_TYPE_FIELD(EEClass, /*pointer*/, FieldDescList, cdac_data<EEClass>::FieldDescList)
 CDAC_TYPE_FIELD(EEClass, /*uint32*/, CorTypeAttr, cdac_data<EEClass>::CorTypeAttr)
 CDAC_TYPE_FIELD(EEClass, /*uint8*/, InternalCorElementType, cdac_data<EEClass>::InternalCorElementType)
+CDAC_TYPE_FIELD(EEClass, /*uint16*/, NumInstanceFields, cdac_data<EEClass>::NumInstanceFields)
+CDAC_TYPE_FIELD(EEClass, /*uint16*/, NumStaticFields, cdac_data<EEClass>::NumStaticFields)
+CDAC_TYPE_FIELD(EEClass, /*uint16*/, NumThreadStaticFields, cdac_data<EEClass>::NumThreadStaticFields)
 CDAC_TYPE_FIELD(EEClass, /*uint16*/, NumNonVirtualSlots, cdac_data<EEClass>::NumNonVirtualSlots)
 CDAC_TYPE_END(EEClass)
 
@@ -968,6 +972,7 @@ CDAC_GLOBAL_POINTER(StringMethodTable, &::g_pStringClass)
 CDAC_GLOBAL_POINTER(SyncTableEntries, &::g_pSyncTable)
 CDAC_GLOBAL_POINTER(MiniMetaDataBuffAddress, &::g_MiniMetaDataBuffAddress)
 CDAC_GLOBAL_POINTER(MiniMetaDataBuffMaxSize, &::g_MiniMetaDataBuffMaxSize)
+CDAC_GLOBAL_POINTER(DacNotificationFlags, &::g_dacNotificationFlags)
 CDAC_GLOBAL_POINTER(OffsetOfCurrentThreadInfo, &::g_offsetOfCurrentThreadInfo)
 #ifdef TARGET_WINDOWS
 CDAC_GLOBAL_POINTER(TlsIndexBase, &::_tls_index)

src/coreclr/jit/compiler.h

@@ -4741,11 +4741,6 @@ class Compiler
     void getHWIntrinsicImmTypes(NamedIntrinsic       intrinsic,
                                 CORINFO_SIG_INFO*    sig,
                                 unsigned             immNumber,
-                                var_types            simdBaseType,
-                                CorInfoType          simdBaseJitType,
-                                CORINFO_CLASS_HANDLE op1ClsHnd,
-                                CORINFO_CLASS_HANDLE op2ClsHnd,
-                                CORINFO_CLASS_HANDLE op3ClsHnd,
                                 unsigned*            immSimdSize,
                                 var_types*           immSimdBaseType);
 
@@ -6990,8 +6985,8 @@ class Compiler
 public:
     PhaseStatus optOptimizeBools();
     PhaseStatus optRecognizeAndOptimizeSwitchJumps();
-    bool optSwitchConvert(BasicBlock* firstBlock, int testsCount, ssize_t* testValues, weight_t falseLikelihood, GenTree* nodeToTest);
-    bool optSwitchDetectAndConvert(BasicBlock* firstBlock, bool testingForConversion = false);
+    bool optSwitchConvert(BasicBlock* firstBlock, int testsCount, ssize_t* testValues, weight_t falseLikelihood, GenTree* nodeToTest, bool testingForConversion = false, BitVec* ccmpVec = nullptr);
+    bool optSwitchDetectAndConvert(BasicBlock* firstBlock, bool testingForConversion = false, BitVec* ccmpVec = nullptr);
 
     PhaseStatus optInvertLoops();    // Invert loops so they're entered at top and tested at bottom.
     PhaseStatus optOptimizeFlow();   // Simplify flow graph and do tail duplication

src/coreclr/jit/gentree.cpp

@@ -32399,10 +32399,10 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree)
                 GenTreeHWIntrinsic* cvtOp1 = op1->AsHWIntrinsic();
                 GenTreeHWIntrinsic* cvtOp2 = (effectiveOper == GT_NOT) ? cvtOp1 : op2->AsHWIntrinsic();
 
-                unsigned simdBaseTypeSize = genTypeSize(simdBaseType);
+                var_types op1SimdBaseType = cvtOp1->GetSimdBaseType();
+                var_types op2SimdBaseType = cvtOp2->GetSimdBaseType();
 
-                if ((genTypeSize(cvtOp1->GetSimdBaseType()) == simdBaseTypeSize) &&
-                    (genTypeSize(cvtOp2->GetSimdBaseType()) == simdBaseTypeSize))
+                if (genTypeSize(op1SimdBaseType) == genTypeSize(op2SimdBaseType))
                 {
                     // We need both operands to be the same kind of mask; otherwise
                     // the bitwise operation can differ in how it performs
@@ -32455,6 +32455,12 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree)
                         tree->gtFlags &= ~GTF_REVERSE_OPS;
                     }
 
+                    // The bitwise operation is likely normalized to int or uint, while
+                    // the underlying convert ops may be a small type. We need to preserve
+                    // such a small type since that indicates how many elements are in the mask.
+                    simdBaseJitType = cvtOp1->GetSimdBaseJitType();
+                    tree->SetSimdBaseJitType(simdBaseJitType);
+
                     tree->gtType = TYP_MASK;
                     DEBUG_DESTROY_NODE(op1);