3 files changed, 19 insertions, 2 deletions
diff --git a/gcc/rust/typecheck/rust-tyty-resolver.h b/gcc/rust/typecheck/rust-tyty-resolver.h
index 1ee533e..b971e66 100644
--- a/gcc/rust/typecheck/rust-tyty-resolver.h
+++ b/gcc/rust/typecheck/rust-tyty-resolver.h
@@ -87,12 +87,18 @@ public:
 
       auto resolved_tyty = resolved_type;
       for (auto it : gathered_types)
-	resolved_tyty = resolved_tyty->combine (it);
+	{
+	  auto combined = resolved_tyty->combine (it);
+	  if (combined == nullptr)
+	    break;
+
+	  resolved_tyty = combined;
+	}
 
       // something is not inferred we need to look at all references now
       if (resolved_tyty == nullptr || resolved_tyty->is_unit ())
 	{
-	  rust_error_at (decl->get_locus_slow (), "failed to resolve type");
+	  rust_fatal_error (decl->get_locus_slow (), "failed to resolve type");
 	  return false;
 	}
 
diff --git a/gcc/testsuite/rust.test/compilable/shadow1.rs b/gcc/testsuite/rust.test/compilable/shadow1.rs
new file mode 100644
index 0000000..3cb1ec5
--- /dev/null
+++ b/gcc/testsuite/rust.test/compilable/shadow1.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let mut x = 5;
+    let mut x;
+    x = true;
+}
diff --git a/gcc/testsuite/rust.test/fail_compilation/shadow1.rs b/gcc/testsuite/rust.test/fail_compilation/shadow1.rs
new file mode 100644
index 0000000..18c5c58
--- /dev/null
+++ b/gcc/testsuite/rust.test/fail_compilation/shadow1.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let mut x = 5;
+    let mut x;
+    x = true;
+    x = x + 2;
+}