Skip to content

Commit ffd9a6c

Browse files
committed
---
yaml --- r: 177588 b: refs/heads/auto c: ff25fd6 h: refs/heads/master v: v3
1 parent 049546b commit ffd9a6c

File tree

3 files changed

+29
-8
lines changed

3 files changed

+29
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: d2ab7d3ea8ff80089c9f5d8a3db37de0000eb246
13+
refs/heads/auto: ff25fd660ac7240f4c8379e74108a462a9aaba77
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/rt/unwind.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ pub mod eabi {
254254
}
255255

256256
#[no_mangle] // referenced from rust_try.ll
257-
#[allow(unexported_no_mangle)]
258257
pub extern "C" fn rust_eh_personality_catch(
259258
_version: c_int,
260259
actions: uw::_Unwind_Action,
@@ -293,7 +292,7 @@ pub mod eabi {
293292

294293
#[lang="eh_personality"]
295294
#[no_mangle] // referenced from rust_try.ll
296-
#[allow(unexported_no_mangle)]
295+
#[allow(private_no_mangle_fns)]
297296
pub extern "C" fn rust_eh_personality(
298297
version: c_int,
299298
actions: uw::_Unwind_Action,
@@ -309,7 +308,6 @@ pub mod eabi {
309308
}
310309

311310
#[no_mangle] // referenced from rust_try.ll
312-
#[allow(unexported_no_mangle)]
313311
pub extern "C" fn rust_eh_personality_catch(
314312
_version: c_int,
315313
actions: uw::_Unwind_Action,
@@ -348,7 +346,7 @@ pub mod eabi {
348346

349347
#[lang="eh_personality"]
350348
#[no_mangle] // referenced from rust_try.ll
351-
#[allow(unexported_no_mangle)]
349+
#[allow(private_no_mangle_fns)]
352350
extern "C" fn rust_eh_personality(
353351
state: uw::_Unwind_State,
354352
ue_header: *mut uw::_Unwind_Exception,
@@ -361,7 +359,6 @@ pub mod eabi {
361359
}
362360

363361
#[no_mangle] // referenced from rust_try.ll
364-
#[allow(unexported_no_mangle)]
365362
pub extern "C" fn rust_eh_personality_catch(
366363
state: uw::_Unwind_State,
367364
_ue_header: *mut uw::_Unwind_Exception,
@@ -439,7 +436,7 @@ pub mod eabi {
439436

440437
#[lang="eh_personality"]
441438
#[no_mangle] // referenced from rust_try.ll
442-
#[allow(unexported_no_mangle)]
439+
#[allow(private_no_mangle_fns)]
443440
extern "C" fn rust_eh_personality(
444441
exceptionRecord: *mut EXCEPTION_RECORD,
445442
establisherFrame: *mut c_void,
@@ -454,7 +451,6 @@ pub mod eabi {
454451
}
455452

456453
#[no_mangle] // referenced from rust_try.ll
457-
#[allow(unexported_no_mangle)]
458454
pub extern "C" fn rust_eh_personality_catch(
459455
exceptionRecord: *mut EXCEPTION_RECORD,
460456
establisherFrame: *mut c_void,
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2015 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+
// compile-flags:-F private_no_mangle_fns
12+
13+
// FIXME(#19495) no_mangle'ing main ICE's.
14+
#[no_mangle]
15+
fn foo() { //~ ERROR function foo is marked #[no_mangle], but not exported
16+
}
17+
18+
#[no_mangle]
19+
pub fn bar() {
20+
}
21+
22+
fn main() {
23+
foo();
24+
bar();
25+
}

0 commit comments

Comments
 (0)