diff --git a/src/test/compile-fail/issue-20105.rs b/src/test/compile-fail/issue-20105.rs
new file mode 100644
index 00000000000..f133a59d722
--- /dev/null
+++ b/src/test/compile-fail/issue-20105.rs
@@ -0,0 +1,17 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn f<F, R>(_: F) where F: Fn() -> R {
+}
+
+fn main() {
+    f(|| -> ! { () });
+//~^ ERROR: computation may converge in a function marked as diverging [E0270]
+}