diff options
| author | bors <bors@rust-lang.org> | 2022-07-27 04:18:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-27 04:18:49 +0000 |
| commit | e33cc71a61c91e1d510bf283e9d345067e64eed2 (patch) | |
| tree | 17c9c1bf9b1c7f77be51a944a515a275f4b3ac6f /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | b573e10d21b69ebfadf41aa9c2f0a27919fe4480 (diff) | |
| parent | 0d5bdcac5ff0c5cbc6ed0a04663788a23cc62adf (diff) | |
| download | rust-e33cc71a61c91e1d510bf283e9d345067e64eed2.tar.gz rust-e33cc71a61c91e1d510bf283e9d345067e64eed2.zip | |
Auto merge of #99792 - JohnTitor:rollup-20i7ewx, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #98583 (Stabilize Windows `FileTypeExt` with `is_symlink_dir` and `is_symlink_file`) - #99698 (Prefer visibility map parents that are not `doc(hidden)` first) - #99700 (Add a clickable link to the layout section) - #99712 (passes: port more of `check_attr` module) - #99759 (Remove dead code from cg_llvm) - #99765 (Don't build std for *-uefi targets) - #99771 (Update pulldown-cmark version to 0.9.2 (fixes url encoding for some chars)) - #99775 (rustdoc: do not allocate String when writing path full name) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index fffc2dd2b84..ef1a65488e2 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -88,10 +88,6 @@ extern "C" char *LLVMRustGetLastError(void) { return Ret; } -extern "C" unsigned int LLVMRustGetInstructionCount(LLVMModuleRef M) { - return unwrap(M)->getInstructionCount(); -} - extern "C" void LLVMRustSetLastError(const char *Err) { free((void *)LastError); LastError = strdup(Err); @@ -1529,11 +1525,6 @@ extern "C" void LLVMRustSetComdat(LLVMModuleRef M, LLVMValueRef V, } } -extern "C" void LLVMRustUnsetComdat(LLVMValueRef V) { - GlobalObject *GV = unwrap<GlobalObject>(V); - GV->setComdat(nullptr); -} - enum class LLVMRustLinkage { ExternalLinkage = 0, AvailableExternallyLinkage = 1, |
