diff options
| author | Jack Huey <jack.huey@umassmed.edu> | 2020-10-11 17:14:07 -0400 |
|---|---|---|
| committer | Jack Huey <jack.huey@umassmed.edu> | 2020-10-16 12:58:50 -0400 |
| commit | 11d62aa2849b48b850c412cc7ce20d8a60a74ab8 (patch) | |
| tree | 057d5007b580ee98e94b9b08f5a089444e580082 /compiler/rustc_codegen_llvm/src | |
| parent | dd5c9bf1392bdc697740e62a1924b7942cdfd86a (diff) | |
| download | rust-11d62aa2849b48b850c412cc7ce20d8a60a74ab8.tar.gz rust-11d62aa2849b48b850c412cc7ce20d8a60a74ab8.zip | |
Review comments
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/intrinsic.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs index e1f675e3ae9..e9900e8bc10 100644 --- a/compiler/rustc_codegen_llvm/src/intrinsic.rs +++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs @@ -718,11 +718,10 @@ fn get_rust_try_fn<'ll, 'tcx>( hir::Unsafety::Unsafe, Abi::Rust, ))); - let output = tcx.types.i32; - // `unsafe fn(unsafe fn(*mut i8) -> (), unsafe fn(*mut i8, *mut i8) -> ()) -> i32` + // `unsafe fn(unsafe fn(*mut i8) -> (), *mut i8, unsafe fn(*mut i8, *mut i8) -> ()) -> i32` let rust_fn_sig = ty::Binder::dummy(cx.tcx.mk_fn_sig( vec![try_fn_ty, i8p, catch_fn_ty].into_iter(), - output, + tcx.types.i32, false, hir::Unsafety::Unsafe, Abi::Rust, |