OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #67986 - JohnTitor:fix-ice-rust-call, r=varkor 

Display more informative ICE

Fixes #66696
This commit is contained in:
Mazdak Farrokhzad 2020-01-09 00:22:13 +01:00 committed by GitHub
parent 0b3ef24e75 c524f3ca98
commit ea9a03dbb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc/ty/layout.rs
View File

@ -2507,17 +2507,21 @@ where
let extra_args = if sig.abi == RustCall {
assert!(!sig.c_variadic && extra_args.is_empty());
match sig.inputs().last().unwrap().kind {
ty::Tuple(tupled_arguments) => {
if let Some(input) = sig.inputs().last() {
if let ty::Tuple(tupled_arguments) = input.kind {
inputs = &sig.inputs()[0..sig.inputs().len() - 1];
tupled_arguments.iter().map(|k| k.expect_ty()).collect()
}
_ => {
} else {
bug!(
"argument to function with \"rust-call\" ABI \
is not a tuple"
is not a tuple"
);
}
} else {
bug!(
"argument to function with \"rust-call\" ABI \
is not a tuple"
);
}
} else {
assert!(sig.c_variadic || extra_args.is_empty());