diff --git a/compiler/rustc_borrowck/src/region_infer/opaque_types.rs b/compiler/rustc_borrowck/src/region_infer/opaque_types.rs
index 33f07c1d8fc41..80cba31fff13d 100644
--- a/compiler/rustc_borrowck/src/region_infer/opaque_types.rs
+++ b/compiler/rustc_borrowck/src/region_infer/opaque_types.rs
@@ -88,15 +88,11 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                     Some(region) => {
                         let vid = self.universal_regions.to_region_vid(region);
                         subst_regions.push(vid);
-                        region
+                        Some(region)
                     }
                     None => {
                         subst_regions.push(vid);
-                        ty::Region::new_error_with_message(
-                            infcx.tcx,
-                            concrete_type.span,
-                            "opaque type with non-universal region substs",
-                        )
+                        None
                     }
                 }
             };
@@ -118,7 +114,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                     return region;
                 }
                 let vid = self.to_region_vid(region);
-                to_universal_region(vid, &mut subst_regions)
+                to_universal_region(vid, &mut subst_regions).unwrap_or(region)
             });
             debug!(?universal_substs);
             debug!(?subst_regions);
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.rs
new file mode 100644
index 0000000000000..7250310a59cd7
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.rs
@@ -0,0 +1,9 @@
+#![allow(unconditional_recursion)]
+
+fn foo<'a: 'a>() -> impl Sized {
+    let _: *mut &'a () = foo::<'a>();
+    //~^ ERROR
+    loop {}
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.stderr
new file mode 100644
index 0000000000000..13f2b2114a765
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.stderr
@@ -0,0 +1,18 @@
+error[E0700]: hidden type for `impl Sized` captures lifetime that does not appear in bounds
+  --> $DIR/recursive-impl-trait-type-direct-with-earlybound-lifetime-2.rs:4:12
+   |
+LL | fn foo<'a: 'a>() -> impl Sized {
+   |        --           ---------- opaque type defined here
+   |        |
+   |        hidden type `*mut &'a ()` captures the lifetime `'a` as defined here
+LL |     let _: *mut &'a () = foo::<'a>();
+   |            ^^^^^^^^^^^
+   |
+help: to declare that `impl Sized` captures `'a`, you can add an explicit `'a` lifetime bound
+   |
+LL | fn foo<'a: 'a>() -> impl Sized + 'a {
+   |                                ++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0700`.
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-3.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-3.rs
new file mode 100644
index 0000000000000..6257e87653f63
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-3.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![allow(unconditional_recursion)]
+
+fn foo<'a: 'a>() -> impl Sized + 'a {
+    let _: *mut &'a () = foo::<'a>();
+    loop {}
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.rs
new file mode 100644
index 0000000000000..77578b60cddee
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.rs
@@ -0,0 +1,13 @@
+#![allow(unconditional_recursion)]
+
+trait Trait<'a, 'b> {}
+impl<'a, 'b, T> Trait<'a, 'b> for T {}
+
+fn foo<'a: 'a, 'b: 'b>() -> impl Trait<'a, 'b> {
+    let _: *mut &'a () = foo::<'a, 'b>();
+    let _: *mut &'b () = foo::<'a, 'b>();
+    //~^ ERROR
+    loop {}
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.stderr
new file mode 100644
index 0000000000000..2fff3b796493f
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.stderr
@@ -0,0 +1,14 @@
+error: concrete type differs from previous defining opaque type use
+  --> $DIR/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.rs:8:12
+   |
+LL |     let _: *mut &'b () = foo::<'a, 'b>();
+   |            ^^^^^^^^^^^ expected `*mut &'a ()`, got `*mut &'b ()`
+   |
+note: previous use here
+  --> $DIR/recursive-impl-trait-type-direct-with-earlybound-lifetime-4.rs:7:12
+   |
+LL |     let _: *mut &'a () = foo::<'a, 'b>();
+   |            ^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime.rs
new file mode 100644
index 0000000000000..7f15d4e6303f5
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-earlybound-lifetime.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![allow(unconditional_recursion)]
+
+fn foo<'a: 'a>() -> impl Sized {
+    let _: () = foo::<'a>();
+    loop {}
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-lifetime.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-lifetime.rs
new file mode 100644
index 0000000000000..956a4d4c94641
--- /dev/null
+++ b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct-with-lifetime.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![allow(unconditional_recursion)]
+
+fn test<'a>() -> impl Sized + 'a {
+    let r: i32 = test();
+    r
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-direct.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-direct.rs
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-direct.rs
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-indirect.drop_tracking.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.drop_tracking.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-indirect.drop_tracking.stderr
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.drop_tracking.stderr
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-indirect.drop_tracking_mir.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.drop_tracking_mir.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-indirect.drop_tracking_mir.stderr
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.drop_tracking_mir.stderr
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-indirect.no_drop_tracking.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.no_drop_tracking.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-indirect.no_drop_tracking.stderr
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.no_drop_tracking.stderr
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-indirect.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-indirect.rs
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-indirect.rs
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-through-non-recursive.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.rs
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-through-non-recursive.rs
diff --git a/tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr b/tests/ui/impl-trait/recursive/recursive-impl-trait-type-through-non-recursive.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-impl-trait-type-through-non-recursive.stderr
rename to tests/ui/impl-trait/recursive/recursive-impl-trait-type-through-non-recursive.stderr
diff --git a/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs b/tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
rename to tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle-2.rs
diff --git a/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr b/tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
rename to tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle-2.stderr
diff --git a/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs b/tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.rs
rename to tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle.rs
diff --git a/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr b/tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
similarity index 100%
rename from tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
rename to tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration-too-subtle.stderr
diff --git a/tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs b/tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration.rs
similarity index 100%
rename from tests/ui/impl-trait/recursive-type-alias-impl-trait-declaration.rs
rename to tests/ui/impl-trait/recursive/recursive-type-alias-impl-trait-declaration.rs