Skip to content

Commit 1927a86

Browse files
committed
Fix for issue rust-lang#28012: pow overflow inconsistency
Overflows in integer pow() computations would be missed if they preceded a 0 bit of the exponent being processed. This made calls such as 2i32.pow(1024) not trigger an overflow.
1 parent 1110f1e commit 1927a86

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

Diff for: src/libcore/num/mod.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -537,25 +537,21 @@ macro_rules! int_impl {
537537
let mut base = self;
538538
let mut acc = Self::one();
539539

540-
let mut prev_base = self;
541-
let mut base_oflo = false;
542-
while exp > 0 {
540+
while exp > 1 {
543541
if (exp & 1) == 1 {
544-
if base_oflo {
545-
// ensure overflow occurs in the same manner it
546-
// would have otherwise (i.e. signal any exception
547-
// it would have otherwise).
548-
acc = acc * (prev_base * prev_base);
549-
} else {
550-
acc = acc * base;
551-
}
542+
acc = acc * base;
552543
}
553-
prev_base = base;
554-
let (new_base, new_base_oflo) = base.overflowing_mul(base);
555-
base = new_base;
556-
base_oflo = new_base_oflo;
557544
exp /= 2;
545+
base = base * base;
546+
}
547+
548+
// Deal with the final bit of the exponent separately, since
549+
// squaring the base afterwards is not necessary and may cause a
550+
// needless overflow.
551+
if exp == 1 {
552+
acc = acc * base;
558553
}
554+
559555
acc
560556
}
561557

0 commit comments

Comments
 (0)