Auto merge of #34942 - porglezomp:master, r=sfackler

Fix overflow checking in unsigned pow()

The pow() method for unsigned integers produced 0 instead of trapping overflow for certain inputs. Calls such as 2u32.pow(1024) produced 0 when they should trap an overflow. This also adds tests for the correctly handling overflow in unsigned pow().

This was previously fixed for signed integers in #28248, but it seems unsigned integers got missed that time.

For issue number #34913
This commit is contained in:
bors
2016-09-19 19:03:52 -07:00
committed by GitHub
3 changed files with 27 additions and 15 deletions

View File

@@ -2211,25 +2211,21 @@ macro_rules! uint_impl {
let mut base = self;
let mut acc = 1;
let mut prev_base = self;
let mut base_oflo = false;
while exp > 0 {
while exp > 1 {
if (exp & 1) == 1 {
if base_oflo {
// ensure overflow occurs in the same manner it
// would have otherwise (i.e. signal any exception
// it would have otherwise).
acc = acc * (prev_base * prev_base);
} else {
acc = acc * base;
}
acc = acc * base;
}
prev_base = base;
let (new_base, new_base_oflo) = base.overflowing_mul(base);
base = new_base;
base_oflo = new_base_oflo;
exp /= 2;
base = base * base;
}
// Deal with the final bit of the exponent separately, since
// squaring the base afterwards is not necessary and may cause a
// needless overflow.
if exp == 1 {
acc = acc * base;
}
acc
}