Merge branch 'dotnet:main' into intrinsics

LeVladIonescu · Mar 23, 2023 · c6ef7ac · c6ef7ac
2 parents f0209d8 + 316d286
commit c6ef7ac
Show file tree

Hide file tree

Showing 109 changed files with 3,777 additions and 2,148 deletions.
diff --git a/.github/ISSUE_TEMPLATE/04_known_issue.yml b/.github/ISSUE_TEMPLATE/04_known_issue.yml
@@ -0,0 +1,32 @@
+name: Known Issue Report
+description: Create a known issue directly
+labels: ["blocking-clean-ci","Known Build Error"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Use this template to report issues currently affecting PR stability, be it build or test failures.
+  - type: textarea
+    id: background
+    attributes:
+      label: Error Blob
+      description: Please identify a clear error string that can help identify future instances of this issue. For more information on how to fill this check https://github.com/dotnet/arcade/blob/main/Documentation/Projects/Build%20Analysis/KnownIssues.md#filling-out-known-issues-json-blob
+      placeholder: |
+        ```json
+        {
+          "ErrorMessage": "",
+          "BuildRetry": false,
+          "ErrorPattern": "",
+          "ExcludeConsoleLog": true
+        }
+        ```
+    validations:
+      required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: Reproduction Steps
+      description: |
+        If possible describe where you observe the issue with links and any other relevant details.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/04_blank_issue.md → .github/ISSUE_TEMPLATE/05_blank_issue.md b/.github/ISSUE_TEMPLATE/04_blank_issue.md → .github/ISSUE_TEMPLATE/05_blank_issue.md
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
@@ -79,7 +79,8 @@
             "area-System.Transactions"
           ],
           "mentionees": [
-            "roji"
+            "roji",
+            "ajcvickers"
           ]
         },
         {
@@ -399,9 +400,7 @@
             "area-System.ComponentModel.DataAnnotations"
           ],
           "mentionees": [
-            "ajcvickers",
-            "bricelam",
-            "roji"
+            "jeffhandley"
           ]
         },
         {
@@ -870,7 +869,7 @@
         {
           "name": "addReply",
           "parameters": {
-            "comment": "Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. \n\n1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+), then remove this `needs-breaking-change-doc-created` label.\n\nTagging @dotnet/compat for awareness of the breaking change."
+            "comment": "Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. \n\n1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.\n\nTagging @dotnet/compat for awareness of the breaking change."
           }
         }
       ],
@@ -911,7 +910,7 @@
         {
           "name": "addReply",
           "parameters": {
-            "comment": "Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. \n\nWhen you commit this breaking change:\n\n1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+), then remove this `needs-breaking-change-doc-created` label.\n2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.\n\nTagging @dotnet/compat for awareness of the breaking change."
+            "comment": "Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. \n\nWhen you commit this breaking change:\n\n1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.\n2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.\n\nTagging @dotnet/compat for awareness of the breaking change."
           }
         }
       ],

diff --git a/docs/area-owners.json b/docs/area-owners.json
@@ -763,21 +763,24 @@
       "owners": [
         "ajcvickers",
         "david-engel",
-        "davoudeshtehari"
+        "davoudeshtehari",
+        "roji"
       ],
       "label": "area-System.Data"
     },
     {
       "lead": "ajcvickers",
       "owners": [
-        "ajcvickers"
+        "ajcvickers",
+        "roji"
       ],
       "label": "area-System.Data.Odbc"
     },
     {
       "lead": "ajcvickers",
       "owners": [
-        "ajcvickers"
+        "ajcvickers",
+        "roji"
       ],
       "label": "area-System.Data.OleDB"
     },
@@ -1513,7 +1516,8 @@
     {
       "lead": "ajcvickers",
       "owners": [
-        "roji"
+        "roji",
+		"ajcvickers"
       ],
       "label": "area-System.Transactions"
     },

diff --git a/docs/area-owners.md b/docs/area-owners.md
@@ -71,9 +71,9 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
 | area-System.Composition                        | @ericstj             | @dotnet/area-system-composition                     |                                                                                                                                                                                                                                                                                           |
 | area-System.Configuration                      | @ericstj             | @dotnet/area-system-configuration                   |                                                                                                                                                                                                                                                                                           |
 | area-System.Console                            | @jeffhandley         | @dotnet/area-system-console                         |                                                                                                                                                                                                                                                                                           |
-| area-System.Data                               | @ajcvickers          | @ajcvickers @davoudeshtehari @david-engel           | <ul><li>Odbc, OleDb - @saurabh500</li></ul>                                                                                                                                                                                                                                               |
-| area-System.Data.Odbc                          | @ajcvickers          | @ajcvickers                                         |                                                                                                                                                                                                                                                                                           |
-| area-System.Data.OleDB                         | @ajcvickers          | @ajcvickers                                         |                                                                                                                                                                                                                                                                                           |
+| area-System.Data                               | @ajcvickers          | @ajcvickers @davoudeshtehari @david-engel @roji     | <ul><li>Odbc, OleDb - @saurabh500</li></ul>                                                                                                                                                                                                                                               |
+| area-System.Data.Odbc                          | @ajcvickers          | @ajcvickers @roji                                   |                                                                                                                                                                                                                                                                                           |
+| area-System.Data.OleDB                         | @ajcvickers          | @ajcvickers @roji                                   |                                                                                                                                                                                                                                                                                           |
 | area-System.Data.SqlClient                     | @David-Engel         | @davoudeshtehari @david-engel @jrahnama             | Archived component - limited churn/contributions (see https://devblogs.microsoft.com/dotnet/introducing-the-new-microsoftdatasqlclient/)                                                                                                                                                  |
 | area-System.DateTime                           | @ericstj             | @dotnet/area-system-datetime                        | System namespace APIs related to dates and times, including DateOnly, DateTime, DateTimeKind, DateTimeOffset, DayOfWeek, TimeOnly, TimeSpan, TimeZone, and TimeZoneInfo                                                                                                                   |
 | area-System.Diagnostics                        | @tommcdon            | @tommcdon                                           |                                                                                                                                                                                                                                                                                           |

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -85,9 +85,9 @@
       <Sha>f32e148d67dbf348685c3076a37e8bc68ab3a30f</Sha>
       <SourceBuild RepoName="cecil" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.3.23167.1">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.4.23170.1">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>25d9f7a5e38a2d61b94ff341bc0d32135fcb15f9</Sha>
+      <Sha>a464820353b7956538b07c9b53103d793b5e15b6</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -10,7 +10,7 @@
     <PackageVersionNet7>7.0.3</PackageVersionNet7>
     <PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>3</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>4</PreReleaseVersionIteration>
     <WorkloadVersionSuffix Condition="'$(PreReleaseVersionLabel)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
     <SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
     <!-- Set assembly version to align with major and minor version,
@@ -241,7 +241,7 @@
          Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
                like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
     -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.3.23167.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23170.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ILGenerator.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ILGenerator.cs
@@ -1189,12 +1189,12 @@ public virtual void ThrowException([DynamicallyAccessedMembers(DynamicallyAccess
 
             if (!excType.IsSubclassOf(typeof(Exception)) && excType != typeof(Exception))
             {
-                throw new ArgumentException(SR.Argument_NotExceptionType);
+                throw new ArgumentException(SR.Argument_NotExceptionType, nameof(excType));
             }
             ConstructorInfo? con = excType.GetConstructor(Type.EmptyTypes);
             if (con == null)
             {
-                throw new ArgumentException(SR.Argument_MissingDefaultConstructor);
+                throw new ArgumentException(SR.Arg_NoDefCTorWithoutTypeName, nameof(excType));
             }
             Emit(OpCodes.Newobj, con);
             Emit(OpCodes.Throw);

diff --git a/src/coreclr/debug/ee/funceval.cpp b/src/coreclr/debug/ee/funceval.cpp
@@ -1708,7 +1708,7 @@ void ResolveFuncEvalGenericArgInfo(DebuggerEval *pDE)
     // If this is a new object operation, then we should have a .ctor.
     if ((pDE->m_evalType == DB_IPCE_FET_NEW_OBJECT) && !pDE->m_md->IsCtor())
     {
-        COMPlusThrow(kArgumentException, W("Argument_MissingDefaultConstructor"));
+        COMPlusThrow(kArgumentException, W("Arg_NoDefCTorWithoutTypeName"));
     }
 
     pDE->m_md->EnsureActive();

diff --git a/src/coreclr/inc/stresslog.h b/src/coreclr/inc/stresslog.h
@@ -597,14 +597,14 @@ struct StressLogChunk
 
     void * operator new (size_t size) throw()
     {
-        if (IsInCantAllocStressLogRegion ())
-        {
-            return NULL;
-        }
 #ifdef MEMORY_MAPPED_STRESSLOG
         if (s_memoryMapped)
             return StressLog::AllocMemoryMapped(size);
 #endif //MEMORY_MAPPED_STRESSLOG
+        if (IsInCantAllocStressLogRegion ())
+        {
+            return NULL;
+        }
 #ifdef HOST_WINDOWS
         _ASSERTE(s_LogChunkHeap);
         return HeapAlloc(s_LogChunkHeap, 0, size);

diff --git a/src/coreclr/jit/CMakeLists.txt b/src/coreclr/jit/CMakeLists.txt
@@ -151,6 +151,7 @@ set( JIT_SOURCES
   morphblock.cpp
   objectalloc.cpp
   optcse.cpp
+  optimizebools.cpp
   optimizer.cpp
   patchpoint.cpp
   phase.cpp

diff --git a/src/coreclr/jit/block.cpp b/src/coreclr/jit/block.cpp
@@ -1151,6 +1151,13 @@ unsigned BasicBlock::NumSucc(Compiler* comp)
 
         case BBJ_EHFINALLYRET:
         {
+            // We may call this method before we realize we have invalid IL. Tolerate.
+            //
+            if (!hasHndIndex())
+            {
+                return 0;
+            }
+
             // The first block of the handler is labelled with the catch type.
             BasicBlock* hndBeg = comp->fgFirstBlockOfHandler(this);
             if (hndBeg->bbCatchTyp == BBCT_FINALLY)

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -9802,6 +9802,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
         STRESS_MODE(MERGED_RETURNS)                                                             \
         STRESS_MODE(BB_PROFILE)                                                                 \
         STRESS_MODE(OPT_BOOLS_GC)                                                               \
+        STRESS_MODE(OPT_BOOLS_COMPARE_CHAIN_COST)                                               \
         STRESS_MODE(REMORPH_TREES)                                                              \
         STRESS_MODE(64RSLT_MUL)                                                                 \
         STRESS_MODE(DO_WHILE_LOOPS)                                                             \

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
@@ -16440,7 +16440,7 @@ bool Compiler::gtSplitTree(
             }
 
             Statement* stmt = nullptr;
-            if (!(*use)->IsValue() || (*use)->OperIs(GT_ASG) || (user == nullptr) ||
+            if (!(*use)->IsValue() || (*use)->gtEffectiveVal()->OperIs(GT_ASG) || (user == nullptr) ||
                 (user->OperIs(GT_COMMA) && (user->gtGetOp1() == *use)))
             {
                 GenTree* sideEffects = nullptr;