diff options
| author | bors <bors@rust-lang.org> | 2020-02-24 22:43:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-24 22:43:10 +0000 |
| commit | f3e1a954d2ead4e2fc197c7da7d71e6c61bad196 (patch) | |
| tree | 78ac0c7d2b153e49c3b1ad911c8ce89f8115023b | |
| parent | ded0270fec18538620b656f3f2e45b1674cdb1a3 (diff) | |
| parent | acb239945aa8a27f0cfd1992c943f4617260ba26 (diff) | |
| download | rust-f3e1a954d2ead4e2fc197c7da7d71e6c61bad196.tar.gz rust-f3e1a954d2ead4e2fc197c7da7d71e6c61bad196.zip | |
Auto merge of #69444 - pietroalbini:stable-next-final-v2-new, r=pietroalbini 1.41.1
[stable] Cherry-pick LLVM fix for 1.41.1 This PR cherry-picks the LLVM patch required to properly fix https://github.com/rust-lang/rust/issues/69225 on 1.41.1, and adds a test to make sure the fix works. r? @ghost
| m--------- | src/llvm-project | 0 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs | 33 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/llvm-project b/src/llvm-project -Subproject 2cb41005ed5c4747b10d2bf01d8779d3bb4ae32 +Subproject 7d5e7c023053660ffe494d72ce471e48ecc7f49 diff --git a/src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs b/src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs new file mode 100644 index 00000000000..6e030f1cc48 --- /dev/null +++ b/src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs @@ -0,0 +1,33 @@ +// run-fail +// compile-flags: -C opt-level=3 +// error-pattern: index out of bounds: the len is 0 but the index is 16777216 +// ignore-wasm no panic or subprocess support +// ignore-emscripten no panic or subprocess support + +fn do_test(x: usize) { + let mut arr = vec![vec![0u8; 3]]; + + let mut z = vec![0]; + for arr_ref in arr.iter_mut() { + for y in 0..x { + for _ in 0..1 { + z.reserve_exact(x); + let iterator = std::iter::repeat(0).take(x); + let mut cnt = 0; + iterator.for_each(|_| { + z[0] = 0; + cnt += 1; + }); + let a = y * x; + let b = (y + 1) * x - 1; + let slice = &mut arr_ref[a..b]; + slice[1 << 24] += 1; + } + } + } +} + +fn main() { + do_test(1); + do_test(2); +} |
