diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-09-10 14:03:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 14:03:29 +0200 |
| commit | 485847dd701b5d2161fb8b13730d93e14d6bcfcc (patch) | |
| tree | 22468825e8d5666dd614912857daa41d71a88f53 | |
| parent | d3ef39f2af2301e349649189f313772f99da1b37 (diff) | |
| parent | 967c4e63477a847a946186dc1b6e5fd601caf464 (diff) | |
| download | rust-485847dd701b5d2161fb8b13730d93e14d6bcfcc.tar.gz rust-485847dd701b5d2161fb8b13730d93e14d6bcfcc.zip | |
Rollup merge of #44451 - Zoxc:gen-panic, r=eddyb
Fix bitrotted generator panic emission r? @eddyb
| -rw-r--r-- | src/librustc_trans/mir/block.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs index 0f42a244a1f..3e802c8be5b 100644 --- a/src/librustc_trans/mir/block.rs +++ b/src/librustc_trans/mir/block.rs @@ -383,16 +383,16 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> { }; let msg_str = Symbol::intern(str).as_str(); let msg_str = C_str_slice(bcx.ccx, msg_str); - let msg_file_line = C_struct(bcx.ccx, - &[msg_str, filename, line], + let msg_file_line_col = C_struct(bcx.ccx, + &[msg_str, filename, line, col], false); - let align = llalign_of_min(bcx.ccx, common::val_ty(msg_file_line)); - let msg_file_line = consts::addr_of(bcx.ccx, - msg_file_line, - align, - "panic_loc"); + let align = llalign_of_min(bcx.ccx, common::val_ty(msg_file_line_col)); + let msg_file_line_col = consts::addr_of(bcx.ccx, + msg_file_line_col, + align, + "panic_loc"); (lang_items::PanicFnLangItem, - vec![msg_file_line], + vec![msg_file_line_col], None) } }; |