diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-28 18:15:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 18:15:39 +0200 |
| commit | 16ef483b79da2bee891d58f5da97456f71573cc0 (patch) | |
| tree | 31d2399f817e9906721c8bbed0a03cf40af2b65f /src/librustc_codegen_llvm | |
| parent | f91a3abade0764714af1ad7cb49e8b1d298cd0b3 (diff) | |
| parent | fe19ed8737fb0270b88adab77787940cc37ac6c9 (diff) | |
| download | rust-16ef483b79da2bee891d58f5da97456f71573cc0.tar.gz rust-16ef483b79da2bee891d58f5da97456f71573cc0.zip | |
Rollup merge of #61164 - RalfJung:scalar, r=oli-obk
rename Scalar::Bits to Scalar::Raw and bits field to data Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor). r? @oli-obk
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/common.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs index b9fd9629e6f..c713362440d 100644 --- a/src/librustc_codegen_llvm/common.rs +++ b/src/librustc_codegen_llvm/common.rs @@ -294,13 +294,13 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { ) -> &'ll Value { let bitsize = if layout.is_bool() { 1 } else { layout.value.size(self).bits() }; match cv { - Scalar::Bits { size: 0, .. } => { + Scalar::Raw { size: 0, .. } => { assert_eq!(0, layout.value.size(self).bytes()); self.const_undef(self.type_ix(0)) }, - Scalar::Bits { bits, size } => { + Scalar::Raw { data, size } => { assert_eq!(size as u64, layout.value.size(self).bytes()); - let llval = self.const_uint_big(self.type_ix(bitsize), bits); + let llval = self.const_uint_big(self.type_ix(bitsize), data); if layout.value == layout::Pointer { unsafe { llvm::LLVMConstIntToPtr(llval, llty) } } else { |
