Auto merge of #116279 - cuviper:beta-next, r=cuviper

[beta] backports - Only prevent field projections into opaque types, not types containing opaque types #116156 - Update LLVM submodule #116227 r? cuviper
rust-lang · Sep 29, 2023 · 2ce543c · 2ce543c
2 parents 975e63f + a544df1
commit 2ce543c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/compiler/rustc_hir_typeck/src/mem_categorization.rs b/compiler/rustc_hir_typeck/src/mem_categorization.rs
@@ -464,7 +464,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
         // Opaque types can't have field projections, but we can instead convert
         // the current place in-place (heh) to the hidden type, and then apply all
         // follow up projections on that.
-        if node_ty != place_ty && place_ty.has_opaque_types() {
+        if node_ty != place_ty && matches!(place_ty.kind(), ty::Alias(ty::Opaque, ..)) {
             projections.push(Projection { kind: ProjectionKind::OpaqueCast, ty: node_ty });
         }
         projections.push(Projection { kind, ty });

diff --git a/src/llvm-project b/src/llvm-project
diff --git a/tests/ui/impl-trait/opaque-cast-field-access-in-future.rs b/tests/ui/impl-trait/opaque-cast-field-access-in-future.rs
@@ -0,0 +1,27 @@
+// edition: 2021
+
+use std::future::Future;
+
+async fn bop() {
+    fold(run(), |mut foo| async move {
+        &mut foo.bar;
+    })
+}
+
+fn fold<Fut, F, U>(_: Foo<U>, f: F)
+where
+    F: FnMut(Foo<U>) -> Fut,
+{
+    loop {}
+}
+
+struct Foo<F> {
+    bar: Vec<F>,
+}
+
+fn run() -> Foo<impl Future<Output = ()>> {
+    //~^ ERROR type annotations needed
+    loop {}
+}
+
+fn main() {}
diff --git a/tests/ui/impl-trait/opaque-cast-field-access-in-future.stderr b/tests/ui/impl-trait/opaque-cast-field-access-in-future.stderr
@@ -0,0 +1,9 @@
+error[E0282]: type annotations needed
+  --> $DIR/opaque-cast-field-access-in-future.rs:22:17
+   |
+LL | fn run() -> Foo<impl Future<Output = ()>> {
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0282`.
+14 −3		.github/workflows/release-tasks.yml
+12 −5		clang/lib/AST/ExprConstant.cpp
+1 −2		clang/lib/Frontend/TextDiagnostic.cpp
+19 −0		clang/test/Misc/diag-style.cpp
+13 −0		clang/test/SemaCXX/cxx2a-virtual-base-used.cpp
+1 −1		libcxx/include/__config
+1 −1		lld/COFF/Writer.cpp
+40 −170		lld/test/COFF/guard-ehcont.s
+1 −1		llvm/CMakeLists.txt
+10 −0		llvm/include/llvm/Transforms/Utils/Local.h
+6 −14		llvm/lib/Analysis/InlineCost.cpp
+14 −48		llvm/lib/CodeGen/StackColoring.cpp
+3 −1		llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+6 −1		llvm/lib/Transforms/Scalar/GVN.cpp
+14 −9		llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
+34 −27		llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
+24 −7		llvm/lib/Transforms/Utils/Local.cpp
+14 −14		llvm/test/CodeGen/AArch64/arm64ec-varargs.ll
+49 −15		llvm/test/CodeGen/AArch64/sve-calling-convention-mixed.ll
+190 −0		llvm/test/CodeGen/X86/stack-coloring-wineh.ll
+103 −0		llvm/test/Transforms/GVN/pr64598.ll
+71 −0		llvm/test/Transforms/GVN/pr65447.ll
+0 −36		llvm/test/Transforms/Inline/target-features-vs-alwaysinline.ll
+18 −0		llvm/test/Transforms/MemCpyOpt/memcpy.ll
+260 −0		llvm/test/Transforms/SimpleLoopUnswitch/inject-invariant-conditions-exponential.ll
+35 −20		llvm/test/Transforms/SimpleLoopUnswitch/inject-invariant-conditions.ll
+14 −16		llvm/tools/llvm-readobj/COFFDumper.cpp
+1 −1		llvm/utils/gn/secondary/llvm/version.gni
+1 −1		llvm/utils/lit/lit/__init__.py