File tree 1 file changed +6
-2
lines changed
src/tools/compiletest/src
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -1710,12 +1710,16 @@ impl<'test> TestCx<'test> {
1710
1710
rustc. args ( & self . props . compile_flags ) ;
1711
1711
1712
1712
// FIXME(jieyouxu): we should report a fatal error or warning if user wrote `-Cpanic=` with
1713
- // something that's not `abort`, however, by moving this last we should override previous
1714
- // `-Cpanic=`s
1713
+ // something that's not `abort` and `-Cforce-unwind-tables` with a value that is not `yes`,
1714
+ // however, by moving this last we should override previous `-Cpanic`s and
1715
+ // `-Cforce-unwind-tables`s. Note that checking here is very fragile, because we'd have to
1716
+ // account for all possible compile flag splittings (they have some... intricacies and are
1717
+ // not yet normalized).
1715
1718
//
1716
1719
// `minicore` requires `#![no_std]` and `#![no_core]`, which means no unwinding panics.
1717
1720
if self . props . add_core_stubs {
1718
1721
rustc. arg ( "-Cpanic=abort" ) ;
1722
+ rustc. arg ( "-Cforce-unwind-tables=yes" ) ;
1719
1723
}
1720
1724
1721
1725
rustc
You can’t perform that action at this time.
0 commit comments