Merge upstream v2.100.1

.cirrus.yml

@@ -199,7 +199,7 @@ task:
   install_prerequisites_script: |
     cd $CIRRUS_WORKING_DIR/..
     sysctl -n hw.ncpu
-    pkg install -y git cmake ninja gmake llvm bash gtar p7zip
+    pkg install -y git cmake ninja gmake llvm bash gtar 7-zip
     python3 --version
     python3 -m ensurepip
     # Download & extract host LDC
@@ -298,7 +298,7 @@ task:
     artifactName=ldc2-$artifactID-$CI_OS-x86_64
     mv installed $artifactName
     chmod -R go=rX $artifactName
-    gtar -cf - --owner=0 --group=0 $artifactName | 7za a artifacts/$artifactName.tar.xz -si -txz -mx9
+    gtar -cf - --owner=0 --group=0 $artifactName | 7z a artifacts/$artifactName.tar.xz -si -txz -mx9
   # Upload to GitHub release (only for commits on the master branch and tags)
   upload_to_github_script: |
     cd $CIRRUS_WORKING_DIR

CHANGELOG.md

@@ -1,7 +1,7 @@
 # LDC master
 
 #### Big news
-- Frontend, druntime and Phobos are at version [2.100.0+](https://dlang.org/changelog/2.100.0.html). (#3970, #4008)
+- Frontend, druntime and Phobos are at version [2.100.1](https://dlang.org/changelog/2.100.0.html). (#3970, #4008, #4009)
 - LLVM for prebuilt packages bumped to v14.0.3. (#3952, #3979)
   - All LLVM targets are enabled now (=> more targets for cross-compilation).
   - For the Mac package, the minimum supported macOS version has been raised to v10.12.

CMakeLists.txt

@@ -111,7 +111,7 @@ include(GetLinuxDistribution)
 set(LDC_VERSION "1.30.0") # May be overridden by git hash tag
 set(DMDFE_MAJOR_VERSION   2)
 set(DMDFE_MINOR_VERSION   100)
-set(DMDFE_PATCH_VERSION   0)
+set(DMDFE_PATCH_VERSION   1)
 
 set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}.${DMDFE_PATCH_VERSION})
 

dmd/statementsem.d

@@ -2919,10 +2919,20 @@ version (IN_LLVM)
             rs.error("`return` statements cannot be in contracts");
             errors = true;
         }
-        if (sc.os && sc.os.tok != TOK.onScopeFailure)
+        if (sc.os)
         {
-            rs.error("`return` statements cannot be in `%s` bodies", Token.toChars(sc.os.tok));
-            errors = true;
+            // @@@DEPRECATED_2.112@@@
+            // Deprecated in 2.100, transform into an error in 2.112
+            if (sc.os.tok == TOK.onScopeFailure)
+            {
+                rs.deprecation("`return` statements cannot be in `scope(failure)` bodies.");
+                deprecationSupplemental(rs.loc, "Use try-catch blocks for this purpose");
+            }
+            else
+            {
+                rs.error("`return` statements cannot be in `%s` bodies", Token.toChars(sc.os.tok));
+                errors = true;
+            }
         }
         if (sc.tf)
         {

packaging/dlang-tools_version

@@ -1 +1 @@
-v2.100.0
+v2.100.1

packaging/reggae_version

@@ -1 +1 @@
-v0.9.3
+v0.9.4