Index: lib/IR/Core.cpp
===================================================================
--- lib/IR/Core.cpp
+++ lib/IR/Core.cpp
@@ -563,9 +563,12 @@
   return nullptr;
 }
 
-void LLVMSetMetadata(LLVMValueRef Inst, unsigned KindID, LLVMValueRef MD) {
-  MDNode *N =
-      MD ? cast<MDNode>(unwrap<MetadataAsValue>(MD)->getMetadata()) : nullptr;
+void LLVMSetMetadata(LLVMValueRef Inst, unsigned KindID, LLVMValueRef Val) {
+  Metadata *MD = Val ? unwrap<MetadataAsValue>(Val)->getMetadata() : nullptr;
+
+  MDNode *N = MD
+    ? (isa<MDNode>(MD) ? cast<MDNode>(MD) : MDNode::get(unwrap(Val)->getContext(), MD))
+    : nullptr;
   unwrap<Instruction>(Inst)->setMetadata(KindID, N);
 }