diff options
| author | bors <bors@rust-lang.org> | 2019-11-05 09:31:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-05 09:31:36 +0000 |
| commit | d1fff4a4b213b3341c1ff994061b7965a5932c70 (patch) | |
| tree | 092a1579b1c3ddeccf48280bbf1d0a0294eaa716 /src/rustllvm/RustWrapper.cpp | |
| parent | 2e4da3caadc61fab2cfcffebcbfdd72fbcee62b7 (diff) | |
| parent | 1ffa93e5f8229c34286f50d1d79dd410324a7d9d (diff) | |
| download | rust-d1fff4a4b213b3341c1ff994061b7965a5932c70.tar.gz rust-d1fff4a4b213b3341c1ff994061b7965a5932c70.zip | |
Auto merge of #66109 - pietroalbini:rollup-2npidna, r=pietroalbini
Rollup of 10 pull requests Successful merges: - #65136 (Update codegen option documentation.) - #65574 (docs: improve disclaimer regarding LinkedList) - #65720 (Add FFI bindings for LLVM's Module::getInstructionCount()) - #65905 ([doc] fixes for unix/vxworks `OpenOptionsExt::mode`) - #65962 (Fix logic in example.) - #66019 (Improved std::iter::Chain documentation) - #66038 (doc(str): show example of chars().count() under len()) - #66042 (Suggest correct code when encountering an incorrect trait bound referencing the current trait) - #66073 (Do not needlessly write-lock) - #66096 (Add a failing UI test for multiple loops of all kinds in a `const`) Failed merges: r? @ghost
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 16d08ee534e..e6c45b8e362 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -87,6 +87,14 @@ extern "C" char *LLVMRustGetLastError(void) { return Ret; } +extern "C" unsigned int LLVMRustGetInstructionCount(LLVMModuleRef M) { +#if LLVM_VERSION_GE(7, 0) + return unwrap(M)->getInstructionCount(); +#else + report_fatal_error("Module::getInstructionCount not available before LLVM 7"); +#endif +} + extern "C" void LLVMRustSetLastError(const char *Err) { free((void *)LastError); LastError = strdup(Err); |
