Auto merge of rust-lang#118994 - cuviper:beta-next, r=cuviper

[beta] backports - temporarily revert "ice on ambguity in mir typeck" rust-lang#118736 - Update to LLVM 17.0.6 rust-lang#118936 r? ghost
rust-lang-ci · Dec 16, 2023 · 52efffb · 52efffb
2 parents 4bd9c37 ff1c216
commit 52efffb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -33,7 33,7 @@
 [submodule "src/llvm-project"]
  path = src/llvm-project
  url = https://github.com/rust-lang/llvm-project.git
- branch = rustc/17.0-2023-09-19
  branch = rustc/17.0-2023-12-14
  shallow = true
 [submodule "src/doc/embedded-book"]
  path = src/doc/embedded-book

diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
@@ -157,18 157,10 @@ where
  }
 
  let mut region_constraints = QueryRegionConstraints::default();
- let (output, error_info, mut obligations) =
- Q::fully_perform_into(self, infcx, &mut region_constraints)
- .map_err(|_| {
- infcx.tcx.sess.delay_span_bug(span, format!("error performing {self:?}"))
- })
- .and_then(|(output, error_info, obligations, certainty)| match certainty {
- Certainty::Proven => Ok((output, error_info, obligations)),
- Certainty::Ambiguous => Err(infcx
- .tcx
- .sess
- .delay_span_bug(span, format!("ambiguity performing {self:?}"))),
- })?;
  let (output, error_info, mut obligations, _) =
  Q::fully_perform_into(self, infcx, &mut region_constraints).map_err(|_| {
  infcx.tcx.sess.delay_span_bug(span, format!("error performing {self:?}"))
  })?;
 
  // Typically, instantiating NLL query results does not
  // create obligations. However, in some cases there

diff --git a/src/llvm-project b/src/llvm-project
diff --git a/tests/ui/wf/unnormalized-projection-guides-inference.rs b/tests/ui/wf/unnormalized-projection-guides-inference.rs
@@ -0,0 1,24 @@
 // The WF requirements of the *unnormalized* form of type annotations
 // can guide inference.
 // check-pass
 
 pub trait EqualTo {
  type Ty;
 }
 impl<X> EqualTo for X {
  type Ty = X;
 }
 
 trait MyTrait<U: EqualTo<Ty = Self>> {
  type Out;
 }
 impl<T, U: EqualTo<Ty = T>> MyTrait<U> for T {
  type Out = ();
 }
 
 fn main() {
  let _: <_ as MyTrait<u8>>::Out;
  // We shoud be able to infer a value for the inference variable above.
  // The WF of the unnormalized projection requires `u8: EqualTo<Ty = _>`,
  // which is sufficient to guide inference.
 }