Skip to content

Commit 79d4f14

Browse files
committed
auto merge of #5779 : crabtw/rust/x86_64_abi, r=sanxiyn
This fixes #5754.
2 parents 8c2e5cc + 685c4d0 commit 79d4f14

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-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/rt/rust_builtin.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,16 @@ rust_dbg_extern_identity_TwoU64s(TwoU64s u) {
866866
return u;
867867
}
868868

869+
struct TwoDoubles {
870+
double one;
871+
double two;
872+
};
873+
874+
extern "C" CDECL TwoDoubles
875+
rust_dbg_extern_identity_TwoDoubles(TwoDoubles u) {
876+
return u;
877+
}
878+
869879
extern "C" CDECL double
870880
rust_dbg_extern_identity_double(double u) {
871881
return u;

src/rt/rustrt.def.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ rust_opendir
199199
rust_dbg_extern_identity_u32
200200
rust_dbg_extern_identity_u64
201201
rust_dbg_extern_identity_TwoU64s
202+
rust_dbg_extern_identity_TwoDoubles
202203
rust_dbg_extern_identity_double
203204
rust_dbg_extern_identity_u8
204205
rust_get_rt_env

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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 TwoDoubles {
12+
r: float,
13+
i: float
14+
}
15+
16+
extern "C" {
17+
fn rust_dbg_extern_identity_TwoDoubles(arg1: TwoDoubles) -> TwoDoubles;
18+
}
19+
20+
pub fn main() {}

0 commit comments

Comments
 (0)