Rollup merge of rust-lang#46691 - varkor:contrib-3, r=rkruppe

kennytm · web-flow · commit 37cc63ab134d · 2017-12-13T04:28:08.000+08:00
Fix return value of `LLVMRustMetadataAsValue`

`LLVMRustMetadataAsValue` would previously return `void`, despite the
corresponding Rust function expecting to return a `ValueRef`.
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -566,8 +566,8 @@ extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M, const char *Name,`
`566`	`566`	`unwrap(M)->addModuleFlag(Module::Warning, Name, Value);`
`567`	`567`	`}`
`568`	`568`
`569`		`-extern "C" void LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) {`
`570`		`- wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD)));`
	`569`	`+extern "C" LLVMValueRef LLVMRustMetadataAsValue(LLVMContextRef C, LLVMMetadataRef MD) {`
	`570`	`+ return wrap(MetadataAsValue::get(*unwrap(C), unwrap(MD)));`
`571`	`571`	`}`
`572`	`572`
`573`	`573`	`extern "C" LLVMRustDIBuilderRef LLVMRustDIBuilderCreate(LLVMModuleRef M) {`