Fix existing tests and add new tests.

Author: lrh2000

gcc/rust/hir/rust-ast-lower-block.h

@@ -43,7 +43,7 @@ class ASTLoweringBlock : public ASTLoweringBase
       }
 
     if (terminated != nullptr)
-      *terminated = resolver.terminated;
+      *terminated |= resolver.terminated;
     return resolver.translated;
   }
 
@@ -76,7 +76,7 @@ class ASTLoweringIfBlock : public ASTLoweringBase
 	  resolver.translated->get_mappings ().get_hirid (),
 	  resolver.translated);
       }
-    *terminated = resolver.terminated;
+    *terminated |= resolver.terminated;
     return resolver.translated;
   }
 
@@ -115,7 +115,7 @@ class ASTLoweringExprWithBlock : public ASTLoweringBase
 	  resolver.translated);
       }
 
-    *terminated = resolver.terminated;
+    *terminated |= resolver.terminated;
     return resolver.translated;
   }
 

gcc/rust/hir/rust-ast-lower-expr.h

@@ -109,7 +109,7 @@ class ASTLoweringExpr : public ASTLoweringBase
       expr->get_locus_slow ());
 
     if (terminated != nullptr)
-      *terminated = resolver.terminated;
+      *terminated |= resolver.terminated;
 
     return resolver.translated;
   }
@@ -351,7 +351,6 @@ class ASTLoweringExpr : public ASTLoweringBase
 			  "failed to fold capacity constant");
 	return;
       }
-    rust_assert (!terminated);
 
     translated_array_elems
       = new HIR::ArrayElemsCopied (std::unique_ptr<HIR::Expr> (element),

gcc/rust/hir/rust-ast-lower-struct-field-expr.h

@@ -46,7 +46,7 @@ class ASTLowerStructExprField : public ASTLoweringBase
       field->get_locus_slow ());
 
     if (terminated)
-      *terminated = compiler.terminated;
+      *terminated |= compiler.terminated;
 
     return compiler.translated;
   }

gcc/rust/parse/rust-parse-impl.h

@@ -7613,6 +7613,7 @@ Parser<ManagedTokenSource>::parse_return_expr (
     case RIGHT_CURLY:
     case RIGHT_PAREN:
     case RIGHT_SQUARE:
+    case COMMA:
       break;
     default:
       returned_expr

gcc/testsuite/rust.test/compile/block_expr4.rs

@@ -1,8 +1,40 @@
-fn foo() -> isize {
+fn foo() -> i32 {
     0
 }
 
+fn bar() -> i32 {
+    foo();
+    foo()
+}
+
+fn baz() -> i32 {
+    {
+        bar();
+        bar();
+    }
+    {
+        bar();
+        bar()
+    };
+    {
+        bar();
+        bar()
+    }
+}
+
+fn test(ok: i32) -> i32 {
+    if ok >= 1 {
+        foo()
+    } else if ok <= -1 {
+        bar()
+    } else {
+        baz()
+    }
+}
+
 fn main() {
     let a = foo();
-    // { dg-warning "unused name" "" { target *-*-* } .-1 }
+    let b = bar();
+    let c = baz();
+    test(a + b + c);
 }

gcc/testsuite/rust.test/compile/never_type1.rs

@@ -0,0 +1,23 @@
+fn foo(x: i32) -> f32 {
+    let y = if x > 1 {
+        return 2.0;
+    } else {
+        1
+    };
+
+    let z = if x < -1 {
+        -1
+    } else {
+        return -2.0;
+    };
+
+    let mut w: (f32, i32, f32) = (2.3, y + z, 3.3);
+    w = (1.0, return 0.0, -1.0);
+    w = (6.6, 66, 6.6); // { dg-warning "unreachable statement" }
+}
+
+fn main() {
+    foo(-2);
+    foo(0);
+    foo(2);
+}

gcc/testsuite/rust.test/compile/unused.rs

@@ -14,4 +14,4 @@ fn f() {
 
 fn main() {
     f();
-}
+}

gcc/testsuite/rust.test/xfail_compile/break1.rs

@@ -1,7 +1,6 @@
-// { dg-excess-errors "Noisy error and debug" }
-fn main() { // { dg-error "expected .... got .<tyty::error>." }
+fn main() {
     let a;
     a = 1;
-    break a; // { dg-error "cannot `break` outside of a loop"
+    break a; // { dg-error "cannot `break` outside of a loop" }
     // { dg-error "failed to type resolve expression" "" { target { *-*-* } } .-1 }
 }

gcc/testsuite/rust.test/xfail_compile/continue1.rs

@@ -5,6 +5,6 @@ fn main() {
     let _fib = {
         continue; // { dg-error "cannot `continue` outside of a loop" }
         // { dg-error "failed to type resolve expression" "" { target { *-*-* } } .-1 }
-        123
+        123 // { dg-warning "unreachable expression" }
     };
 }

gcc/testsuite/rust.test/xfail_compile/func1.rs

@@ -1,4 +1,4 @@
-fn test(x: i32) -> bool { // { dg-error "expected .bool. got .<tyty::error>.." }
+fn test(x: i32) -> bool {
     return x + 1; // { dg-error "expected .bool. got .i32." }
 }
 

gcc/testsuite/rust.test/xfail_compile/implicit_returns_err1.rs

@@ -1,12 +1,21 @@
-// { dg-error "expected .* got .*" "" { target { *-*-* } } 0 }
-
 fn test(x: i32) -> i32 {
-    if x > 1 {
+    if x > 1 { // { dg-error "expected .... got .<integer>." }
         1
     } else {
         2
     }
-    3
+
+    { // { dg-error "expected .... got .<integer>." }
+        3
+    }
+
+    if x > 1 { 1 } else { 2 };
+    if x > 1 { 1; } else { 2; }
+
+    { 3; }
+    { 3 };
+
+    { 3 }
 }
 
 fn main() {

gcc/testsuite/rust.test/xfail_compile/implicit_returns_err2.rs

@@ -1,9 +1,6 @@
-// { dg-error "expected .* got .*" "" { target { *-*-* } } 0 }
-
 fn test(x: i32) -> i32 {
-    return 1;
-    // { dg-warning "unreachable expression" "" { target *-*-* } .+1 }
-    true
+    return true; // { dg-error "expected .i32. got .bool." }
+    1 // { dg-warning "unreachable expression" }
 }
 
 fn main() {

gcc/testsuite/rust.test/xfail_compile/implicit_returns_err3.rs

@@ -1,5 +1,4 @@
-// { dg-error "expected .* got .*" "" { target { *-*-* } } 0 }
-fn test(x: i32) -> i32 {
+fn test(x: i32) -> i32 { // { dg-error "expected .i32. got ...." }
     if x > 1 {
         1
     }

gcc/testsuite/rust.test/xfail_compile/never_type_err1.rs

@@ -0,0 +1,23 @@
+fn main() {
+    let x = 0.0;
+    let a = {
+        loop {
+            let c = if x > 0.0 {
+                break 3;
+            } else if x < 0.0 {
+                x
+            } else {
+                return;
+            };
+            if x == 0.0 {
+                break c; // { dg-error "expected .<integer>. got .<float>." }
+            } else {
+                continue;
+            }
+            return; // { dg-warning "unreachable statement" }
+        }
+    };
+
+    let a = 1 + return; // { dg-error "cannot apply this operator to types <integer> and !" }
+    // { dg-error "failed to type resolve expression" "" { target { *-*-* } } .-1 }
+}