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.
This commit is contained in:
parent
df40e61382
commit
ecce274e56
2 changed files with 41 additions and 2 deletions
|
@ -127,8 +127,12 @@ impl LlvmType for Reg {
|
||||||
impl LlvmType for CastTarget {
|
impl LlvmType for CastTarget {
|
||||||
fn llvm_type(&self, cx: &CodegenCx) -> Type {
|
fn llvm_type(&self, cx: &CodegenCx) -> Type {
|
||||||
let rest_ll_unit = self.rest.unit.llvm_type(cx);
|
let rest_ll_unit = self.rest.unit.llvm_type(cx);
|
||||||
let rest_count = self.rest.total.bytes() / self.rest.unit.size.bytes();
|
let (rest_count, rem_bytes) = if self.rest.unit.size.bytes() == 0 {
|
||||||
let rem_bytes = self.rest.total.bytes() % self.rest.unit.size.bytes();
|
(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()) {
|
if self.prefix.iter().all(|x| x.is_none()) {
|
||||||
// Simplify to a single unit when there is no prefix and size <= unit size
|
// Simplify to a single unit when there is no prefix and size <= unit size
|
||||||
|
|
35
src/test/ui/issue-50761.rs
Normal file
35
src/test/ui/issue-50761.rs
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// Confirm that we don't accidently divide or mod by zero in llvm_type
|
||||||
|
|
||||||
|
// compile-pass
|
||||||
|
|
||||||
|
#![feature(test)]
|
||||||
|
|
||||||
|
mod a {
|
||||||
|
pub trait A {}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod b {
|
||||||
|
pub struct Builder {}
|
||||||
|
|
||||||
|
pub fn new() -> Builder {
|
||||||
|
Builder {}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Builder {
|
||||||
|
pub fn with_a(&mut self, _a: fn() -> ::a::A) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub use self::b::new;
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Add table
Add a link
Reference in a new issue