Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7262b7b

Browse files
authoredSep 9, 2017
Rollup merge of #44451 - Zoxc:gen-panic, r=eddyb
Fix bitrotted generator panic emission r? @eddyb
2 parents 7ea0adf + 967c4e6 commit 7262b7b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed
 

‎src/librustc_trans/mir/block.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -383,16 +383,16 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
383383
};
384384
let msg_str = Symbol::intern(str).as_str();
385385
let msg_str = C_str_slice(bcx.ccx, msg_str);
386-
let msg_file_line = C_struct(bcx.ccx,
387-
&[msg_str, filename, line],
386+
let msg_file_line_col = C_struct(bcx.ccx,
387+
&[msg_str, filename, line, col],
388388
false);
389-
let align = llalign_of_min(bcx.ccx, common::val_ty(msg_file_line));
390-
let msg_file_line = consts::addr_of(bcx.ccx,
391-
msg_file_line,
392-
align,
393-
"panic_loc");
389+
let align = llalign_of_min(bcx.ccx, common::val_ty(msg_file_line_col));
390+
let msg_file_line_col = consts::addr_of(bcx.ccx,
391+
msg_file_line_col,
392+
align,
393+
"panic_loc");
394394
(lang_items::PanicFnLangItem,
395-
vec![msg_file_line],
395+
vec![msg_file_line_col],
396396
None)
397397
}
398398
};

0 commit comments

Comments
 (0)
Please sign in to comment.