Skip to content

Commit c051593

Browse files
committed
---
yaml --- r: 127214 b: refs/heads/master c: f7aadee h: refs/heads/master v: v3
1 parent 9681c16 commit c051593

File tree

5 files changed

+59
-1
lines changed

5 files changed

+59
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e6e6ef24ab2f18015ba980dda2ae8f4f8cf5b09b
2+
refs/heads/master: f7aadee14ef4c0cf67771664de8d95eac0023de8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 12e0f72f517516ac4fce2aed85e6142e9b874bce
55
refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2014 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+
// ignore-test this should fail to compile (#15844)
12+
13+
#[no_mangle]
14+
fn foo<T>() {} //~ ERROR generic functions must be mangled
15+
16+
#[no_mangle]
17+
extern fn foo<T>() {} //~ ERROR generic functions must be mangled
18+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-include ../tools.mk
2+
3+
all:
4+
$(CC) -std=c99 test.c -c -o $(TMPDIR)/test.o
5+
$(AR) rcs $(TMPDIR)/libtest.a $(TMPDIR)/test.o
6+
$(RUSTC) test.rs -L $(TMPDIR)
7+
$(call RUN,test) || exit 1
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#include <stdint.h>
2+
3+
uint32_t foo();
4+
uint32_t bar();
5+
6+
uint32_t add() {
7+
return foo() + bar();
8+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2014 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+
#[no_mangle]
12+
pub extern "C" fn foo() -> i32 { 3 }
13+
14+
#[no_mangle]
15+
pub extern "C" fn bar() -> i32 { 5 }
16+
17+
#[link(name = "test", kind = "static")]
18+
extern {
19+
fn add() -> i32;
20+
}
21+
22+
fn main() {
23+
let back = unsafe { add() };
24+
assert_eq!(8, back);
25+
}

0 commit comments

Comments
 (0)