diff options
| author | bors <bors@rust-lang.org> | 2017-12-12 20:31:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-12 20:31:17 +0000 |
| commit | 6a360194404c07e09b548626efa4b7c7777510e9 (patch) | |
| tree | db2e54eb07f0c295770a5fb47130ca4d6a76064e /src/rustllvm/RustWrapper.cpp | |
| parent | 707d0708158dabd9b0a12af21a4b51bf1713cb9e (diff) | |
| parent | 80d1de97ade003d83c766f5a9428e343015cc4fb (diff) | |
| download | rust-6a360194404c07e09b548626efa4b7c7777510e9.tar.gz rust-6a360194404c07e09b548626efa4b7c7777510e9.zip | |
Auto merge of #46696 - kennytm:rollup, r=kennytm
Rollup of 4 pull requests - Successful merges: #46668, #46672, #46691, #46694 - Failed merges:
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index ee48d49da46..6f51ea67cb1 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -566,8 +566,8 @@ extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M, const char *Name, unwrap(M)->addModuleFlag(Module::Warning, Name, Value); } -extern "C" void LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) { - wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD))); +extern "C" LLVMValueRef LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) { + return wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD))); } extern "C" LLVMRustDIBuilderRef LLVMRustDIBuilderCreate(LLVMModuleRef M) { |