diff options
| author | bors <bors@rust-lang.org> | 2020-03-13 19:16:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-13 19:16:03 +0000 |
| commit | 1572c433eed495d0ade41511ae106b180e02851d (patch) | |
| tree | 7f39caac777b04c27f8a6a63dbad558fa6b14e29 /src/librustc_codegen_llvm/common.rs | |
| parent | d6072319a9fbeffea2ebe803ddaedbcf566ab5dd (diff) | |
| parent | 1d8f5f0ff5882c2a8cd739eb901cea0ea3c437d4 (diff) | |
| download | rust-1572c433eed495d0ade41511ae106b180e02851d.tar.gz rust-1572c433eed495d0ade41511ae106b180e02851d.zip | |
Auto merge of #69986 - JohnTitor:rollup-h0809mf, r=JohnTitor
Rollup of 12 pull requests Successful merges: - #69403 (Implement `Copy` for `IoSlice`) - #69460 (Move some `build-pass` tests to `check-pass`) - #69723 (Added doc on keyword Pub.) - #69802 (fix more clippy findings) - #69809 (remove lifetimes that can be elided (clippy::needless_lifetimes)) - #69947 (Clean up E0423 explanation) - #69949 (triagebot.toml: add ping aliases) - #69954 (rename panic_if_ intrinsics to assert_) - #69960 (miri engine: fix treatment of abort intrinsic) - #69966 (Add more regression tests) - #69973 (Update stable-since version for const_int_conversion) - #69974 (Clean up E0434 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/common.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/common.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs index 7a33444b352..609ddfc1d3a 100644 --- a/src/librustc_codegen_llvm/common.rs +++ b/src/librustc_codegen_llvm/common.rs @@ -323,7 +323,7 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { } } -pub fn val_ty(v: &'ll Value) -> &'ll Type { +pub fn val_ty(v: &Value) -> &Type { unsafe { llvm::LLVMTypeOf(v) } } @@ -345,6 +345,6 @@ fn hi_lo_to_u128(lo: u64, hi: u64) -> u128 { ((hi as u128) << 64) | (lo as u128) } -fn try_as_const_integral(v: &'ll Value) -> Option<&'ll ConstantInt> { +fn try_as_const_integral(v: &Value) -> Option<&ConstantInt> { unsafe { llvm::LLVMIsAConstantInt(v) } } |
