diff options
| author | bors <bors@rust-lang.org> | 2019-03-28 08:56:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-28 08:56:34 +0000 |
| commit | 237bf3244fffef501cf37d4bda00e1fce3fcfb46 (patch) | |
| tree | ca483d5330b97887970dca2110c007a1084e4aa1 /src/librustc_codegen_llvm | |
| parent | 6bfe4b7b51f47ca014d535506cbc5682f00d8d2a (diff) | |
| parent | d403cd787c98610cf5287301820ad3353b35481d (diff) | |
| download | rust-237bf3244fffef501cf37d4bda00e1fce3fcfb46.tar.gz rust-237bf3244fffef501cf37d4bda00e1fce3fcfb46.zip | |
Auto merge of #59478 - Centril:rollup, r=Centril
Rollup of 12 pull requests Successful merges: - #57987 (Fix some AArch64 typos) - #58581 (Refactor generic parameter encoder functions) - #58803 (fs::copy() unix: set file mode early) - #58848 (Prevent cache issues on version updates) - #59198 (Do not complain about unmentioned fields in recovered patterns) - #59351 (Include llvm-ar with llvm-tools component) - #59413 (HirIdify hir::ItemId) - #59441 (Remove the block on natvis for lld-link.) - #59448 (Use consistent phrasing for all macro summaries) - #59456 (Add documentation about `for` used as higher ranked trait bounds) - #59472 (Document that `std::io::BufReader` discards contents on drop) - #59474 (Fix link capitalization in documentation of std::io::BufWriter.) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/va_arg.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/va_arg.rs b/src/librustc_codegen_llvm/va_arg.rs index 7aceaea4510..7fc17d17f99 100644 --- a/src/librustc_codegen_llvm/va_arg.rs +++ b/src/librustc_codegen_llvm/va_arg.rs @@ -108,12 +108,12 @@ pub(super) fn emit_va_arg( emit_ptr_va_arg(bx, addr, target_ty, false, Align::from_bytes(4).unwrap(), true) } - // Windows Aarch64 + // Windows AArch64 ("aarch64", true) => { emit_ptr_va_arg(bx, addr, target_ty, false, Align::from_bytes(8).unwrap(), false) } - // iOS Aarch64 + // iOS AArch64 ("aarch64", _) if target.target_os == "ios" => { emit_ptr_va_arg(bx, addr, target_ty, false, Align::from_bytes(8).unwrap(), true) |