Fixed more test fails...

dlang · Nov 16, 2024 · ddb56bb · ddb56bb
1 parent 1f42c4b
commit ddb56bb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 38 deletions.
diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
@@ -3287,7 +3287,8 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
             }
             else if (p.storageClass & STC.ref_)
             {
-                if (global.params.rvalueRefParam == FeatureState.enabled &&
+                if (global.params.rvalueRefParam != FeatureState.disabled &&
+                    !(p.storageClass & STC.return_) &&
                     !arg.isLvalue() &&
                     targ.isCopyable())
                 {   /* allow rvalues to be passed to ref parameters by copying
@@ -3298,7 +3299,7 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
                     ev = new CommaExp(arg.loc, ev, new VarExp(arg.loc, v));
                     arg = ev.expressionSemantic(sc);
                 }
-                arg = arg.toLvalue(sc, "create `ref` parameter from");
+                arg = arg.toLvalue(sc, (p.storageClass & STC.return_) ? "create `return ref` parameter from" : "create `ref` parameter from");
 
                 // Look for mutable misaligned pointer, etc., in @safe mode
                 err |= checkUnsafeAccess(sc, arg, false, true);

diff --git a/compiler/src/dmd/typesem.d b/compiler/src/dmd/typesem.d
@@ -2287,8 +2287,8 @@ Type typeSemantic(Type type, const ref Loc loc, Scope* sc)
             // default arg must be an lvalue
             if (isRefOrOut && !isAuto &&
                 !(fparam.storageClass & STC.constscoperef) &&
-                global.params.rvalueRefParam != FeatureState.enabled)
-                e = e.toLvalue(sc, "create default argument for `ref` / `out` parameter from");
+                (global.params.rvalueRefParam == FeatureState.disabled || (fparam.storageClass & (STC.out_ | STC.return_))))
+                e = e.toLvalue(sc, (global.params.rvalueRefParam != FeatureState.disabled) ? "create default argument for `return ref` / `out` parameter from" : "create default argument for `ref` / `out` parameter from");
 
             fparam.defaultArg = e;
             return (e.op != EXP.error);

diff --git a/compiler/test/compilable/reverthelp.d b/compiler/test/compilable/reverthelp.d
@@ -9,5 +9,6 @@ Revertable language changes listed by -revert=name:
   =dip1000          revert DIP1000 changes (Scoped Pointers) (https://github.com/dlang/DIPs/blob/master/DIPs/other/DIP1000.md)
   =intpromote       revert integral promotions for unary + - ~ operators
   =dtorfields       don't destruct fields of partially constructed objects
+  =rvaluerefparam   revert rvalue arguments to ref parameters
 ----
 */
diff --git a/compiler/test/fail_compilation/fail7603a.d b/compiler/test/fail_compilation/fail7603a.d
diff --git a/compiler/test/fail_compilation/fail7603b.d b/compiler/test/fail_compilation/fail7603b.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail7603b.d(7): Error: cannot create default argument for `ref` / `out` parameter from constant `true`
+fail_compilation/fail7603b.d(7): Error: cannot create default argument for `return ref` / `out` parameter from constant `true`
 ---
 */
 void test(out bool val = true) { }
diff --git a/compiler/test/fail_compilation/fail7603c.d b/compiler/test/fail_compilation/fail7603c.d
diff --git a/compiler/test/fail_compilation/fail9773.d b/compiler/test/fail_compilation/fail9773.d
diff --git a/compiler/test/fail_compilation/fail9891.d b/compiler/test/fail_compilation/fail9891.d
@@ -1,9 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9891.d(13): Error: expression `i` of type `immutable(int)` is not implicitly convertible to type `ref int` of parameter `n`
-fail_compilation/fail9891.d(18): Error: expression `i` of type `immutable(int)` is not implicitly convertible to type `out int` of parameter `n`
-fail_compilation/fail9891.d(23): Error: cannot create default argument for `ref` / `out` parameter from expression `prop()` because it is not an lvalue
+fail_compilation/fail9891.d(12): Error: expression `i` of type `immutable(int)` is not implicitly convertible to type `ref int` of parameter `n`
+fail_compilation/fail9891.d(17): Error: expression `i` of type `immutable(int)` is not implicitly convertible to type `out int` of parameter `n`
 ---
 */
 
@@ -19,8 +18,3 @@ void f2(out int n = i)
 {
     ++n;
 }
-
-void f3(ref int n = prop)
-{
-    ++n;
-}