Skip to content

Commit 4ad8ec3

Browse files
committed
fix index out of bounds error of x86_64 ABI
1 parent 65ff441 commit 4ad8ec3

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

src/librustc/middle/trans/cabi_x86_64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] {
256256
cls[i] = sse_int_class;
257257
} else if is_sse(cls[i]) {
258258
i += 1;
259-
while cls[i] == sseup_class { i += 1u; }
259+
while i != e && cls[i] == sseup_class { i += 1u; }
260260
} else if cls[i] == x87_class {
261261
i += 1;
262-
while cls[i] == x87up_class { i += 1u; }
262+
while i != e && cls[i] == x87up_class { i += 1u; }
263263
} else {
264264
i += 1;
265265
}

src/test/run-pass/issue-5754.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
struct S {
12+
r: float
13+
}
14+
15+
extern "C" {
16+
fn rust_dbg_extern_identity_double(arg1: S) -> float;
17+
}
18+
19+
pub fn main() {}

0 commit comments

Comments
 (0)