Merge branch 'main' into browser_src_tests

pavelsavara · web-flow · commit 1bfc7c8c1b5d · 2025-10-03T19:05:18.000+02:00
diff --git a/eng/pipelines/performance/templates/perf-ios-scenarios-build-jobs.yml b/eng/pipelines/performance/templates/perf-ios-scenarios-build-jobs.yml
@@ -1,12 +1,11 @@
 parameters:
-  hybridGlobalization: true
   mono: false
   coreclr: false
   nativeAot: false
 
 jobs:
   - ${{ if eq(parameters.mono, true) }}:
-    # build mono iOS scenarios HybridGlobalization
+    # build mono iOS scenarios
     - template: /eng/pipelines/common/platform-matrix.yml
       parameters:
         jobTemplate: /eng/pipelines/common/global-build-job.yml
@@ -20,8 +19,6 @@ jobs:
           isOfficialBuild: false
           postBuildSteps:
             - template: /eng/pipelines/performance/templates/build-perf-sample-apps.yml
-              parameters:
-                hybridGlobalization: ${{ parameters.hybridGlobalization }}
 
   - ${{ if eq(parameters.coreclr, true) }}:
     # build CoreCLR iOS scenarios
@@ -43,7 +40,7 @@ jobs:
                 runtimeType: coreclr
 
   - ${{ if eq(parameters.nativeAot, true) }}:
-    # build NativeAOT iOS scenarios HybridGlobalization
+    # build NativeAOT iOS scenarios
     - template: /eng/pipelines/common/platform-matrix.yml
       parameters:
         jobTemplate: /eng/pipelines/common/global-build-job.yml
@@ -57,5 +54,3 @@ jobs:
           isOfficialBuild: false
           postBuildSteps:
             - template: /eng/pipelines/performance/templates/build-perf-sample-apps.yml
-              parameters:
-                hybridGlobalization: ${{ parameters.hybridGlobalization }}
diff --git a/src/coreclr/utilcode/debug.cpp b/src/coreclr/utilcode/debug.cpp
@@ -12,6 +12,9 @@
 #include "ex.h"
 #include "corexcep.h"
 #include <time.h>
+#if defined(HOST_IOS) || defined(HOST_TVOS) || defined(HOST_MACCATALYST)
+#include <sys/time.h>
+#endif
 
 #include <minipal/debugger.h>
 
@@ -160,7 +163,15 @@ VOID LogAssert(
     STRESS_LOG2(LF_ASSERT, LL_ALWAYS, "ASSERT:%s:%d\n", szFile, iLine);
 
     struct timespec ts;
+#if defined(HOST_IOS) || defined(HOST_TVOS) || defined(HOST_MACCATALYST)
+    // timespec_get is only available on iOS 13.0+, use gettimeofday instead
+    struct timeval tv;
+    gettimeofday(&tv, nullptr);
+    ts.tv_sec = tv.tv_sec;
+    ts.tv_nsec = tv.tv_usec * 1000;
+#else
     int ret = timespec_get(&ts, TIME_UTC);
+#endif
 
     struct tm local;
 #ifdef HOST_WINDOWS
diff --git a/src/libraries/Common/src/System/Security/Cryptography/ECCng.ImportExport.NamedCurve.cs b/src/libraries/Common/src/System/Security/Cryptography/ECCng.ImportExport.NamedCurve.cs
@@ -152,40 +152,29 @@ internal static SafeNCryptKeyHandle ImportKeyBlob(
 
             using (SafeUnicodeStringHandle safeCurveName = new SafeUnicodeStringHandle(curveName))
             {
-                Interop.BCrypt.BCryptBufferDesc desc = default;
-                Interop.BCrypt.BCryptBuffer buff = default;
-
-                IntPtr descPtr = IntPtr.Zero;
-                IntPtr buffPtr = IntPtr.Zero;
-                try
+                unsafe
                 {
-                    descPtr = Marshal.AllocHGlobal(Marshal.SizeOf(desc));
-                    buffPtr = Marshal.AllocHGlobal(Marshal.SizeOf(buff));
+                    Interop.BCrypt.BCryptBufferDesc desc = default;
+                    Interop.BCrypt.BCryptBuffer buff = default;
+
                     buff.cbBuffer = (curveName.Length + 1) * 2; // Add 1 for null terminator
                     buff.BufferType = Interop.BCrypt.CngBufferDescriptors.NCRYPTBUFFER_ECC_CURVE_NAME;
                     buff.pvBuffer = safeCurveName.DangerousGetHandle();
-                    Marshal.StructureToPtr(buff, buffPtr, false);
 
                     desc.cBuffers = 1;
-                    desc.pBuffers = buffPtr;
+                    desc.pBuffers = (IntPtr)(&buff);
                     desc.ulVersion = Interop.BCrypt.BCRYPTBUFFER_VERSION;
-                    Marshal.StructureToPtr(desc, descPtr, false);
 
                     errorCode = Interop.NCrypt.NCryptImportKey(
                         provider,
                         IntPtr.Zero,
                         blobType,
-                        descPtr,
+                        (IntPtr)(&desc),
                         out keyHandle,
                         ref MemoryMarshal.GetReference(keyBlob),
                         keyBlob.Length,
                         0);
                 }
-                finally
-                {
-                    Marshal.FreeHGlobal(descPtr);
-                    Marshal.FreeHGlobal(buffPtr);
-                }
             }
 
             if (errorCode != ErrorCode.ERROR_SUCCESS)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/MLKem.Windows.cs b/src/libraries/Common/src/System/Security/Cryptography/MLKem.Windows.cs
@@ -26,7 +26,7 @@ private protected unsafe void ReadCngMLKemBlob(
                     throw new CryptographicException();
                 }
 
-                int blobHeaderSize = Marshal.SizeOf<BCRYPT_MLKEM_KEY_BLOB>();
+                int blobHeaderSize = sizeof(BCRYPT_MLKEM_KEY_BLOB);
                 int keySize = checked((int)blob->cbKey);
 
                 if (keySize != destination.Length)
diff --git a/src/libraries/Common/src/System/Security/Cryptography/PqcBlobHelpers.cs b/src/libraries/Common/src/System/Security/Cryptography/PqcBlobHelpers.cs
@@ -216,7 +216,7 @@ internal delegate TReturn EncodeMLKemBlobCallback<TState, TReturn>(
             string blobKind,
             ReadOnlySpan<byte> blob);
 
-        internal static TReturn EncodeMLKemBlob<TState, TReturn>(
+        internal static unsafe TReturn EncodeMLKemBlob<TState, TReturn>(
             KeyBlobMagicNumber kind,
             MLKemAlgorithm algorithm,
             ReadOnlySpan<byte> key,
@@ -230,7 +230,7 @@ internal static TReturn EncodeMLKemBlob<TState, TReturn>(
                 // try to accommodate them.
                 const int MaxKeyStackSize = 128;
                 string parameterSet = GetMLKemParameterSet(algorithm);
-                int blobHeaderSize = Marshal.SizeOf<BCRYPT_MLKEM_KEY_BLOB>();
+                int blobHeaderSize = sizeof(BCRYPT_MLKEM_KEY_BLOB);
                 int parameterSetMarshalLength = (parameterSet.Length + 1) * 2;
                 int blobSize =
                     blobHeaderSize +
@@ -246,15 +246,12 @@ internal static TReturn EncodeMLKemBlob<TState, TReturn>(
                 {
                     buffer.Clear();
 
-                    unsafe
+                    fixed (byte* pBuffer = buffer)
                     {
-                        fixed (byte* pBuffer = buffer)
-                        {
-                            BCRYPT_MLKEM_KEY_BLOB* blob = (BCRYPT_MLKEM_KEY_BLOB*)pBuffer;
-                            blob->dwMagic = kind;
-                            blob->cbParameterSet = (uint)parameterSetMarshalLength;
-                            blob->cbKey = (uint)key.Length;
-                        }
+                        BCRYPT_MLKEM_KEY_BLOB* blob = (BCRYPT_MLKEM_KEY_BLOB*)pBuffer;
+                        blob->dwMagic = kind;
+                        blob->cbParameterSet = (uint)parameterSetMarshalLength;
+                        blob->cbKey = (uint)key.Length;
                     }
 
                     // This won't write the null byte, but we zeroed the whole buffer earlier.
diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/ChainPal.Windows.BuildChain.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/ChainPal.Windows.BuildChain.cs
@@ -36,7 +36,7 @@ internal sealed partial class ChainPal : IDisposable, IChainPal
                 using (SafeCertStoreHandle extraStoreHandle = ConvertStoreToSafeHandle(extraStore))
                 {
                     Interop.Crypt32.CERT_CHAIN_PARA chainPara = default;
-                    chainPara.cbSize = Marshal.SizeOf<Interop.Crypt32.CERT_CHAIN_PARA>();
+                    chainPara.cbSize = sizeof(Interop.Crypt32.CERT_CHAIN_PARA);
 
                     int applicationPolicyCount;
                     using (SafeHandle applicationPolicyOids = applicationPolicy!.ToLpstrArray(out applicationPolicyCount))
@@ -88,12 +88,15 @@ private static SafeChainEngineHandle GetChainEngine(
             if (trustMode == X509ChainTrustMode.CustomRootTrust)
             {
                 // Need to get a valid SafeCertStoreHandle otherwise the default stores will be trusted
-                using (SafeCertStoreHandle customTrustStoreHandle = ConvertStoreToSafeHandle(customTrustStore, true))
+                unsafe
                 {
-                    Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG customChainEngine = default;
-                    customChainEngine.cbSize = Marshal.SizeOf<Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG>();
-                    customChainEngine.hExclusiveRoot = customTrustStoreHandle.DangerousGetHandle();
-                    chainEngineHandle = Interop.crypt32.CertCreateCertificateChainEngine(ref customChainEngine);
+                    using (SafeCertStoreHandle customTrustStoreHandle = ConvertStoreToSafeHandle(customTrustStore, true))
+                    {
+                        Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG customChainEngine = default;
+                        customChainEngine.cbSize = sizeof(Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG);
+                        customChainEngine.hExclusiveRoot = customTrustStoreHandle.DangerousGetHandle();
+                        chainEngineHandle = Interop.crypt32.CertCreateCertificateChainEngine(ref customChainEngine);
+                    }
                 }
             }
             else
diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs
@@ -359,7 +359,7 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode()
         {
-            // Lame, but easy, and will work, and chances are
+            // This is easy and will work; chances are
             // you will only need a few of these.
             return 0;
         }
diff --git a/src/mono/mono/component/hot_reload.c b/src/mono/mono/component/hot_reload.c
@@ -2381,9 +2381,11 @@ hot_reload_apply_changes (int origin, MonoImage *image_base, gconstpointer dmeta
 	if (!assembly_update_supported (image_base, error)) {
 		return;
 	}
-
+	if (dmeta_bytes == 0 && dil_bytes_orig == 0) // we may receive empty updates
+	{
+		return;
+	}
         static int first_origin = -1;
-
         if (first_origin < 0) {
                 first_origin = origin;
         }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ private protected unsafe void ReadCngMLKemBlob(`
`26`	`26`	`throw new CryptographicException();`
`27`	`27`	`}`
`28`	`28`
`29`		`- int blobHeaderSize = Marshal.SizeOf<BCRYPT_MLKEM_KEY_BLOB>();`
	`29`	`+ int blobHeaderSize = sizeof(BCRYPT_MLKEM_KEY_BLOB);`
`30`	`30`	`int keySize = checked((int)blob->cbKey);`
`31`	`31`
`32`	`32`	`if (keySize != destination.Length)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ internal sealed partial class ChainPal : IDisposable, IChainPal`
`36`	`36`	`using (SafeCertStoreHandle extraStoreHandle = ConvertStoreToSafeHandle(extraStore))`
`37`	`37`	`{`
`38`	`38`	`Interop.Crypt32.CERT_CHAIN_PARA chainPara = default;`
`39`		`- chainPara.cbSize = Marshal.SizeOf<Interop.Crypt32.CERT_CHAIN_PARA>();`
	`39`	`+ chainPara.cbSize = sizeof(Interop.Crypt32.CERT_CHAIN_PARA);`
`40`	`40`
`41`	`41`	`int applicationPolicyCount;`
`42`	`42`	`using (SafeHandle applicationPolicyOids = applicationPolicy!.ToLpstrArray(out applicationPolicyCount))`
`@@ -88,12 +88,15 @@ private static SafeChainEngineHandle GetChainEngine(`
`88`	`88`	`if (trustMode == X509ChainTrustMode.CustomRootTrust)`
`89`	`89`	`{`
`90`	`90`	`// Need to get a valid SafeCertStoreHandle otherwise the default stores will be trusted`
`91`		`- using (SafeCertStoreHandle customTrustStoreHandle = ConvertStoreToSafeHandle(customTrustStore, true))`
	`91`	`+ unsafe`
`92`	`92`	`{`
`93`		`- Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG customChainEngine = default;`
`94`		`- customChainEngine.cbSize = Marshal.SizeOf<Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG>();`
`95`		`- customChainEngine.hExclusiveRoot = customTrustStoreHandle.DangerousGetHandle();`
`96`		`- chainEngineHandle = Interop.crypt32.CertCreateCertificateChainEngine(ref customChainEngine);`
	`93`	`+ using (SafeCertStoreHandle customTrustStoreHandle = ConvertStoreToSafeHandle(customTrustStore, true))`
	`94`	`+ {`
	`95`	`+ Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG customChainEngine = default;`
	`96`	`+ customChainEngine.cbSize = sizeof(Interop.Crypt32.CERT_CHAIN_ENGINE_CONFIG);`
	`97`	`+ customChainEngine.hExclusiveRoot = customTrustStoreHandle.DangerousGetHandle();`
	`98`	`+ chainEngineHandle = Interop.crypt32.CertCreateCertificateChainEngine(ref customChainEngine);`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`	`else`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ public override bool Equals(object? obj)`
`359`	`359`
`360`	`360`	`public override int GetHashCode()`
`361`	`361`	`{`
`362`		`- // Lame, but easy, and will work, and chances are`
	`362`	`+ // This is easy and will work; chances are`
`363`	`363`	`// you will only need a few of these.`
`364`	`364`	`return 0;`
`365`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2381,9 +2381,11 @@ hot_reload_apply_changes (int origin, MonoImage *image_base, gconstpointer dmeta`
`2381`	`2381`	`if (!assembly_update_supported (image_base, error)) {`
`2382`	`2382`	`return;`
`2383`	`2383`	`}`
`2384`		`-`
	`2384`	`+ if (dmeta_bytes == 0 && dil_bytes_orig == 0) // we may receive empty updates`
	`2385`	`+ {`
	`2386`	`+ return;`
	`2387`	`+ }`
`2385`	`2388`	`static int first_origin = -1;`
`2386`		`-`
`2387`	`2389`	`if (first_origin < 0) {`
`2388`	`2390`	`first_origin = origin;`
`2389`	`2391`	`}`