diff options
| author | kennytm <kennytm@gmail.com> | 2017-12-13 04:28:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-13 04:28:08 +0800 |
| commit | 37cc63ab134d2924db595dd4894bb94f9ab9e18d (patch) | |
| tree | 3b11cf88e2aa0fc89acfecd65cb6b1e31369b946 /src/rustllvm/RustWrapper.cpp | |
| parent | 6a365417c052fab597c38fe0181fa46f667a1933 (diff) | |
| parent | 6487ee34441987353a0d7e5d91a28877387c130a (diff) | |
| download | rust-37cc63ab134d2924db595dd4894bb94f9ab9e18d.tar.gz rust-37cc63ab134d2924db595dd4894bb94f9ab9e18d.zip | |
Rollup merge of #46691 - varkor:contrib-3, r=rkruppe
Fix return value of `LLVMRustMetadataAsValue` `LLVMRustMetadataAsValue` would previously return `void`, despite the corresponding Rust function expecting to return a `ValueRef`.
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) { |