Merge in 'release/6.0' changes

timandy · Mar 10, 2023 · 964350a · 964350a
2 parents 1e7b01d + cbfaba5
commit 964350a
Show file tree

Hide file tree

Showing 15 changed files with 802 additions and 93 deletions.
diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp
@@ -14044,6 +14044,14 @@ GenTree* Compiler::fgMorphRetInd(GenTreeUnOp* ret)
             // long<->double` there.
             bool canFold = (indSize == lclVarSize) && (lclVarSize <= REGSIZE_BYTES);
 #endif
+
+            // Avoid folding primitives to a struct-typed local for cases where we would maybe need to insert normalization on top.
+            // The backend does not correctly handle this for some promoted locals.
+            if (varTypeIsSmall(info.compRetType) && lclVar->TypeIs(TYP_STRUCT))
+            {
+                canFold = false;
+            }
+
             // TODO: support `genReturnBB != nullptr`, it requires #11413 to avoid `Incompatible types for
             // gtNewTempAssign`.
             if (canFold && (genReturnBB == nullptr))

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -19,8 +19,8 @@
 
     <!-- When building from source, ensure the RID we're building for is part of the RID graph -->
     <AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
-    <ServicingVersion>8</ServicingVersion>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <ServicingVersion>9</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -4121,6 +4121,38 @@
     "any",
     "base"
   ],
+  "fedora.39": [
+    "fedora.39",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.39-arm64": [
+    "fedora.39-arm64",
+    "fedora.39",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.39-x64": [
+    "fedora.39-x64",
+    "fedora.39",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "freebsd": [
     "freebsd",
     "unix",

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1411,6 +1411,23 @@
         "fedora-x64"
       ]
     },
+    "fedora.39": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.39-arm64": {
+      "#import": [
+        "fedora.39",
+        "fedora-arm64"
+      ]
+    },
+    "fedora.39-x64": {
+      "#import": [
+        "fedora.39",
+        "fedora-x64"
+      ]
+    },
     "freebsd": {
       "#import": [
         "unix"

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -71,7 +71,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 

diff --git a/src/libraries/Native/Unix/configure.cmake b/src/libraries/Native/Unix/configure.cmake
@@ -72,6 +72,12 @@ if(C_SUPPORTS_WUNGUARDED_AVAILABILITY)
   set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wunguarded-availability")
 endif()
 
+# Enable building on platforms where strict-prototypes is enabled by default.
+check_c_compiler_flag(-Wno-strict-prototypes COMPILER_SUPPORTS_W_NO_STRICT_PROTOTYPES)
+if(COMPILER_SUPPORTS_W_NO_STRICT_PROTOTYPES)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-prototypes")
+endif()
+
 # in_pktinfo: Find whether this struct exists
 check_include_files(
     "sys/socket.h;linux/in.h"