Rollup of 9 pull requests

compiler/rustc_arena/src/lib.rs

@@ -217,8 +217,12 @@ impl<T> TypedArena<T> {
             let mut chunks = self.chunks.borrow_mut();
             let mut new_cap;
             if let Some(last_chunk) = chunks.last_mut() {
-                let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
-                last_chunk.entries = used_bytes / mem::size_of::<T>();
+                // If a type is `!needs_drop`, we don't need to keep track of how many elements
+                // the chunk stores - the field will be ignored anyway.
+                if mem::needs_drop::<T>() {
+                    let used_bytes = self.ptr.get() as usize - last_chunk.start() as usize;
+                    last_chunk.entries = used_bytes / mem::size_of::<T>();
+                }
 
                 // If the previous chunk's len is less than HUGE_PAGE
                 // bytes, then this chunk will be least double the previous

compiler/rustc_ast_pretty/src/pp.rs

@@ -390,7 +390,7 @@ impl Printer {
         self.scan_stack.pop_front().unwrap()
     }
 
-    fn scan_top(&mut self) -> usize {
+    fn scan_top(&self) -> usize {
         *self.scan_stack.front().unwrap()
     }
 
@@ -484,7 +484,7 @@ impl Printer {
         self.pending_indentation += amount;
     }
 
-    fn get_top(&mut self) -> PrintStackElem {
+    fn get_top(&self) -> PrintStackElem {
         *self.print_stack.last().unwrap_or({
             &PrintStackElem { offset: 0, pbreak: PrintStackBreak::Broken(Breaks::Inconsistent) }
         })

compiler/rustc_ast_pretty/src/pprust/state.rs

@@ -63,7 +63,7 @@ impl<'a> Comments<'a> {
     }
 
     pub fn trailing_comment(
-        &mut self,
+        &self,
         span: rustc_span::Span,
         next_pos: Option<BytePos>,
     ) -> Option<Comment> {

compiler/rustc_mir/src/interpret/intern.rs

@@ -187,6 +187,12 @@ impl<'rt, 'mir, 'tcx: 'mir, M: CompileTimeMachine<'mir, 'tcx>> ValueVisitor<'mir
                 return walked;
             }
         }
+
+        // ZSTs do not need validation unless they're uninhabited
+        if mplace.layout.is_zst() && !mplace.layout.abi.is_uninhabited() {
+            return Ok(());
+        }
+
         self.walk_aggregate(mplace, fields)
     }
 

library/core/src/intrinsics.rs

@@ -1660,22 +1660,22 @@ extern "rust-intrinsic" {
     /// Returns (a + b) mod 2<sup>N</sup>, where N is the width of T in bits.
     ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `checked_add` method. For example,
-    /// [`u32::checked_add`]
+    /// primitives via the `wrapping_add` method. For example,
+    /// [`u32::wrapping_add`]
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_add<T: Copy>(a: T, b: T) -> T;
     /// Returns (a - b) mod 2<sup>N</sup>, where N is the width of T in bits.
     ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `checked_sub` method. For example,
-    /// [`u32::checked_sub`]
+    /// primitives via the `wrapping_sub` method. For example,
+    /// [`u32::wrapping_sub`]
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_sub<T: Copy>(a: T, b: T) -> T;
     /// Returns (a * b) mod 2<sup>N</sup>, where N is the width of T in bits.
     ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `checked_mul` method. For example,
-    /// [`u32::checked_mul`]
+    /// primitives via the `wrapping_mul` method. For example,
+    /// [`u32::wrapping_mul`]
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_mul<T: Copy>(a: T, b: T) -> T;
 

src/librustdoc/lib.rs

@@ -85,12 +85,6 @@ mod theme;
 mod visit_ast;
 mod visit_lib;
 
-struct Output {
-    krate: clean::Crate,
-    renderinfo: config::RenderInfo,
-    renderopts: config::RenderOptions,
-}
-
 pub fn main() {
     rustc_driver::set_sigpipe_handler();
     rustc_driver::install_ice_hook();
@@ -521,15 +515,12 @@ fn main_options(options: config::Options) -> MainResult {
 
     krate.version = crate_version;
 
-    let out = Output { krate, renderinfo, renderopts };
-
     if show_coverage {
         // if we ran coverage, bail early, we don't need to also generate docs at this point
         // (also we didn't load in any of the useful passes)
         return Ok(());
     }
 
-    let Output { krate, renderinfo, renderopts } = out;
     info!("going to format");
     let (error_format, edition, debugging_options) = diag_opts;
     let diag = core::new_handler(error_format, None, &debugging_options);

src/test/codegen/issue-73827-bounds-check-index-in-subexpr.rs

@@ -0,0 +1,18 @@
+// This test checks that bounds checks are elided when
+// index is part of a (x | y) < C style condition
+
+// min-llvm-version: 11.0.0
+// compile-flags: -O
+
+#![crate_type = "lib"]
+
+// CHECK-LABEL: @get
+#[no_mangle]
+pub fn get(array: &[u8; 8], x: usize, y: usize) -> u8 {
+    if x > 7 || y > 7 {
+        0
+    } else {
+        // CHECK-NOT: panic_bounds_check
+        array[y]
+    }
+}

src/test/ui/consts/const-eval/const_panic.rs

@@ -1,11 +1,26 @@
 #![feature(const_panic)]
 #![crate_type = "lib"]
 
-pub const Z: () = panic!("cheese");
+const Z: () = std::panic!("cheese");
 //~^ ERROR any use of this value will cause an error
 
-pub const Y: () = unreachable!();
+const Z2: () = std::panic!();
 //~^ ERROR any use of this value will cause an error
 
-pub const X: () = unimplemented!();
+const Y: () = std::unreachable!();
+//~^ ERROR any use of this value will cause an error
+
+const X: () = std::unimplemented!();
+//~^ ERROR any use of this value will cause an error
+
+const Z_CORE: () = core::panic!("cheese");
+//~^ ERROR any use of this value will cause an error
+
+const Z2_CORE: () = core::panic!();
+//~^ ERROR any use of this value will cause an error
+
+const Y_CORE: () = core::unreachable!();
+//~^ ERROR any use of this value will cause an error
+
+const X_CORE: () = core::unimplemented!();
 //~^ ERROR any use of this value will cause an error

src/test/ui/consts/const-eval/const_panic.stderr

@@ -1,33 +1,83 @@
 error: any use of this value will cause an error
-  --> $DIR/const_panic.rs:4:19
+  --> $DIR/const_panic.rs:4:15
    |
-LL | pub const Z: () = panic!("cheese");
-   | ------------------^^^^^^^^^^^^^^^^-
-   |                   |
-   |                   the evaluated program panicked at 'cheese', $DIR/const_panic.rs:4:19
+LL | const Z: () = std::panic!("cheese");
+   | --------------^^^^^^^^^^^^^^^^^^^^^-
+   |               |
+   |               the evaluated program panicked at 'cheese', $DIR/const_panic.rs:4:15
    |
    = note: `#[deny(const_err)]` on by default
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic.rs:7:19
+  --> $DIR/const_panic.rs:7:16
    |
-LL | pub const Y: () = unreachable!();
-   | ------------------^^^^^^^^^^^^^^-
-   |                   |
-   |                   the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:7:19
+LL | const Z2: () = std::panic!();
+   | ---------------^^^^^^^^^^^^^-
+   |                |
+   |                the evaluated program panicked at 'explicit panic', $DIR/const_panic.rs:7:16
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic.rs:10:19
+  --> $DIR/const_panic.rs:10:15
    |
-LL | pub const X: () = unimplemented!();
-   | ------------------^^^^^^^^^^^^^^^^-
-   |                   |
-   |                   the evaluated program panicked at 'not implemented', $DIR/const_panic.rs:10:19
+LL | const Y: () = std::unreachable!();
+   | --------------^^^^^^^^^^^^^^^^^^^-
+   |               |
+   |               the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:10:15
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 3 previous errors
+error: any use of this value will cause an error
+  --> $DIR/const_panic.rs:13:15
+   |
+LL | const X: () = std::unimplemented!();
+   | --------------^^^^^^^^^^^^^^^^^^^^^-
+   |               |
+   |               the evaluated program panicked at 'not implemented', $DIR/const_panic.rs:13:15
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: any use of this value will cause an error
+  --> $DIR/const_panic.rs:16:20
+   |
+LL | const Z_CORE: () = core::panic!("cheese");
+   | -------------------^^^^^^^^^^^^^^^^^^^^^^-
+   |                    |
+   |                    the evaluated program panicked at 'cheese', $DIR/const_panic.rs:16:20
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: any use of this value will cause an error
+  --> $DIR/const_panic.rs:19:21
+   |
+LL | const Z2_CORE: () = core::panic!();
+   | --------------------^^^^^^^^^^^^^^-
+   |                     |
+   |                     the evaluated program panicked at 'explicit panic', $DIR/const_panic.rs:19:21
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: any use of this value will cause an error
+  --> $DIR/const_panic.rs:22:20
+   |
+LL | const Y_CORE: () = core::unreachable!();
+   | -------------------^^^^^^^^^^^^^^^^^^^^-
+   |                    |
+   |                    the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:22:20
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: any use of this value will cause an error
+  --> $DIR/const_panic.rs:25:20
+   |
+LL | const X_CORE: () = core::unimplemented!();
+   | -------------------^^^^^^^^^^^^^^^^^^^^^^-
+   |                    |
+   |                    the evaluated program panicked at 'not implemented', $DIR/const_panic.rs:25:20
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 8 previous errors
 

src/test/ui/consts/const-eval/const_panic_libcore.stderr → src/test/ui/consts/const-eval/const_panic_libcore_bin.stderr

@@ -1,31 +1,31 @@
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore.rs:5:15
+  --> $DIR/const_panic_libcore_bin.rs:9:15
    |
 LL | const Z: () = panic!("cheese");
    | --------------^^^^^^^^^^^^^^^^-
    |               |
-   |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore.rs:5:15
+   |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore_bin.rs:9:15
    |
    = note: `#[deny(const_err)]` on by default
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore.rs:8:15
+  --> $DIR/const_panic_libcore_bin.rs:12:15
    |
 LL | const Y: () = unreachable!();
    | --------------^^^^^^^^^^^^^^-
    |               |
-   |               the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore.rs:8:15
+   |               the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore_bin.rs:12:15
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore.rs:11:15
+  --> $DIR/const_panic_libcore_bin.rs:15:15
    |
 LL | const X: () = unimplemented!();
    | --------------^^^^^^^^^^^^^^^^-
    |               |
-   |               the evaluated program panicked at 'not implemented', $DIR/const_panic_libcore.rs:11:15
+   |               the evaluated program panicked at 'not implemented', $DIR/const_panic_libcore_bin.rs:15:15
    |
    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 

src/test/ui/issues/issue-68010-large-zst-consts.rs

@@ -0,0 +1,5 @@
+// build-pass
+
+fn main() {
+    println!("{}", [(); std::usize::MAX].len());
+}

src/test/ui/mir/auxiliary/issue_76375_aux.rs

@@ -0,0 +1,14 @@
+// edition:2018
+// compile-flags: -Z mir-opt-level=2 -Z unsound-mir-opts
+
+#[inline(always)]
+pub fn f(s: bool) -> String {
+    let a = "Hello world!".to_string();
+    let b = a;
+    let c = b;
+    if s {
+        c
+    } else {
+        String::new()
+    }
+}

src/test/ui/mir/issue-68841.rs

@@ -0,0 +1,15 @@
+// compile-flags: -Z mir-opt-level=2
+// edition:2018
+// build-pass
+
+#![feature(async_closure)]
+
+use std::future::Future;
+
+fn async_closure() -> impl Future<Output = u8> {
+    (async move || -> u8 { 42 })()
+}
+
+fn main() {
+    let _fut = async_closure();
+}