diff options
| author | Robin Kruppe <robin.kruppe@gmail.com> | 2019-11-13 17:00:47 +0100 |
|---|---|---|
| committer | Robin Kruppe <robin.kruppe@gmail.com> | 2019-11-13 17:00:47 +0100 |
| commit | a1f67ad9490eaa7de7e43e3eda6ca38d14cc2ceb (patch) | |
| tree | 56b6939f259ba115bcfd033382778c3ebb41ea09 /src/librustc_codegen_llvm | |
| parent | 374ad1b0063963060a00a3110e44d76e7105d059 (diff) | |
Revert "Auto merge of #65134 - davidtwco:issue-19834-improper-ctypes-in-extern-C-fn, r=rkruppe"
This reverts commit 3f0e16473de5ec010f44290a8c3ea1d90e0ad7a2, reversing changes made to 61a551b4939ec1d5596e585351038b8fbd0124ba.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/mod.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index e5a5d05ba5e..fa14ce7b03c 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -240,7 +240,9 @@ impl<'a> Drop for DiagnosticHandlers<'a> { } } -fn report_inline_asm(cgcx: &CodegenContext<LlvmCodegenBackend>, msg: &str, cookie: c_uint) { +unsafe extern "C" fn report_inline_asm(cgcx: &CodegenContext<LlvmCodegenBackend>, + msg: &str, + cookie: c_uint) { cgcx.diag_emitter.inline_asm_error(cookie as u32, msg.to_owned()); } diff --git a/src/librustc_codegen_llvm/llvm/mod.rs b/src/librustc_codegen_llvm/llvm/mod.rs index e49462674b3..57815933af0 100644 --- a/src/librustc_codegen_llvm/llvm/mod.rs +++ b/src/librustc_codegen_llvm/llvm/mod.rs @@ -87,7 +87,6 @@ pub struct RustString { } /// Appending to a Rust string -- used by RawRustStringOstream. -#[allow(improper_ctypes)] #[no_mangle] pub unsafe extern "C" fn LLVMRustStringWriteImpl(sr: &RustString, ptr: *const c_char, |