Switch to a unit test.

Author: maleadt

llvm/test/Bindings/llvm-c/vam_mav_extract.ll

@@ -45,7 +45,6 @@ int llvm_add_named_metadata_operand(void);
 int llvm_set_metadata(void);
 int llvm_replace_md_operand(void);
 int llvm_is_a_value_as_metadata(void);
-int llvm_vam_mav_extract(void);
 
 // object.c
 int llvm_object_list_sections(void);

llvm/tools/llvm-c-test/llvm-c-test.h

@@ -56,9 +56,6 @@ static void print_usage(void) {
   fprintf(stderr, "  * --is-a-value-as-metadata\n");
   fprintf(stderr,
           "    Run test for checking if LLVMValueRef is a ValueAsMetadata\n");
-  fprintf(stderr, "  * --vam-mav-extract\n");
-  fprintf(stderr, "    Run test for extracting data from ValueAsMetadata and "
-                  "MetadataAsValue\n");
   fprintf(stderr, "  * --echo\n");
   fprintf(stderr, "    Read bitcode file from stdin - print it back out\n\n");
   fprintf(stderr, "  * --test-diagnostic-handler\n");
@@ -104,8 +101,6 @@ int main(int argc, char **argv) {
     return llvm_replace_md_operand();
   } else if (argc == 2 && !strcmp(argv[1], "--is-a-value-as-metadata")) {
     return llvm_is_a_value_as_metadata();
-  } else if (argc == 2 && !strcmp(argv[1], "--vam-mav-extract")) {
-    return llvm_vam_mav_extract();
   } else if (argc == 2 && !strcmp(argv[1], "--test-function-attributes")) {
     return llvm_test_function_attributes();
   } else if (argc == 2 && !strcmp(argv[1], "--test-callsite-attributes")) {

llvm/tools/llvm-c-test/main.c

@@ -98,21 +98,3 @@ int llvm_is_a_value_as_metadata(void) {
 
   return 0;
 }
-
-int llvm_vam_mav_extract(void) {
-  LLVMModuleRef M = LLVMModuleCreateWithName("Mod");
-  LLVMContextRef Context = LLVMGetModuleContext(M);
-
-  LLVMValueRef Val = LLVMConstInt(LLVMInt32TypeInContext(Context), 0, 0);
-  LLVMMetadataRef MD = LLVMMDStringInContext2(Context, "foo", 3);
-
-  // construction
-  LLVMValueRef MAV = LLVMMetadataAsValue(Context, MD);
-  LLVMMetadataRef VAM = LLVMValueAsMetadata(Val);
-
-  // extraction
-  assert(LLVMMetadataAsValue(Context, VAM) == Val);
-  assert(LLVMValueAsMetadata(MAV) == MD);
-
-  return 0;
-}

llvm/tools/llvm-c-test/metadata.c

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IR/Metadata.h"
+#include "llvm-c/Core.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/IR/Constants.h"
@@ -404,6 +405,17 @@ TEST_F(MDNodeTest, PrintFromMetadataAsValue) {
   EXPECT_PRINTER_EQ("metadata !1", MAV1->printAsOperand(OS, true, MST));
 }
 
+TEST_F(MDNodeTest, ExtractFromValueOrMetadataWrappers) {
+  LLVMValueRef Val = LLVMConstInt(LLVMInt32TypeInContext(wrap(&Context)), 0, 0);
+  LLVMMetadataRef MD = LLVMMDStringInContext2(wrap(&Context), "foo", 3);
+
+  LLVMValueRef MAV = LLVMMetadataAsValue(wrap(&Context), MD);
+  LLVMMetadataRef VAM = LLVMValueAsMetadata(Val);
+
+  EXPECT_EQ(LLVMMetadataAsValue(wrap(&Context), VAM), Val);
+  EXPECT_EQ(LLVMValueAsMetadata(MAV), MD);
+}
+
 TEST_F(MDNodeTest, PrintWithDroppedCallOperand) {
   Module M("test", Context);