diff options
| author | cjkenn <cam.j.kennedy@gmail.com> | 2018-05-16 20:02:01 -0700 |
|---|---|---|
| committer | cjkenn <cam.j.kennedy@gmail.com> | 2018-05-19 08:49:54 -0700 |
| commit | ecce274e56e1da80dff66f9d8886c7645f129244 (patch) | |
| tree | a1e91c0353f567370588cf5b043def7e2f38d36d /src/librustc_codegen_llvm | |
| parent | df40e61382a2cba0be621fdabb9971ce3475e9a7 (diff) | |
| download | rust-ecce274e56e1da80dff66f9d8886c7645f129244.tar.gz rust-ecce274e56e1da80dff66f9d8886c7645f129244.zip | |
use if let to avoid potential div by zero
remove semicolon -_- Add rem_bytes to conditional to avoid error when performing mod by 0 Add test file to confirm compilation passes. Ensure we don't divide or mod by zero in llvm_type. Include test file from issue.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/abi.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/abi.rs b/src/librustc_codegen_llvm/abi.rs index 25c598c532c..221012903d9 100644 --- a/src/librustc_codegen_llvm/abi.rs +++ b/src/librustc_codegen_llvm/abi.rs @@ -127,8 +127,12 @@ impl LlvmType for Reg { impl LlvmType for CastTarget { fn llvm_type(&self, cx: &CodegenCx) -> Type { let rest_ll_unit = self.rest.unit.llvm_type(cx); - let rest_count = self.rest.total.bytes() / self.rest.unit.size.bytes(); - let rem_bytes = self.rest.total.bytes() % self.rest.unit.size.bytes(); + let (rest_count, rem_bytes) = if self.rest.unit.size.bytes() == 0 { + (0, 0) + } else { + (self.rest.total.bytes() / self.rest.unit.size.bytes(), + self.rest.total.bytes() % self.rest.unit.size.bytes()) + }; if self.prefix.iter().all(|x| x.is_none()) { // Simplify to a single unit when there is no prefix and size <= unit size |
