Rollup merge of #53230 - memoryruins:nll_bootstrap_4, r=nikomatsakis

[nll] enable feature(nll) on various crates for bootstrap: part 4

#53172

r? @nikomatsakis

src/librustc_codegen_llvm/lib.rs

@@ -26,6 +26,7 @@
 #![feature(in_band_lifetimes)]
 #![allow(unused_attributes)]
 #![feature(libc)]
+#![cfg_attr(not(stage0), feature(nll))]
 #![feature(quote)]
 #![feature(range_contains)]
 #![feature(rustc_diagnostic_macros)]

src/librustc_codegen_llvm/llvm/ffi.rs

@@ -1564,7 +1564,7 @@ extern "C" {
                                 -> LLVMRustResult;
     pub fn LLVMRustArchiveMemberNew(Filename: *const c_char,
                                     Name: *const c_char,
-                                    Child: Option<&'a ArchiveChild>)
+                                    Child: Option<&ArchiveChild<'a>>)
                                     -> &'a mut RustArchiveMember<'a>;
     pub fn LLVMRustArchiveMemberFree(Member: &'a mut RustArchiveMember<'a>);
 

src/librustc_codegen_llvm/type_of.rs

@@ -89,7 +89,7 @@ fn uncached_llvm_type<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>,
                     Type::struct_(cx, &[fill], packed)
                 }
                 Some(ref name) => {
-                    let mut llty = Type::named_struct(cx, name);
+                    let llty = Type::named_struct(cx, name);
                     llty.set_struct_body(&[fill], packed);
                     llty
                 }