[LLVM-C] Use unwrapDI in LLVMDITypeGetName

[tamird]

Summary

This function otherwise crashes. This behavior has been incorrect since
its introduction in 260b581498bed0b847e7e086852e0082d266711d (D46627).

[tamird]

Add test.

[tamird]

clang-format

[tamird]

Separate test case

[scott.linder]

Could you split the NFC changes to naming/style from the functional fix to LLVMDITypeGetName and the new test?

llvm/tools/llvm-c-test/debuginfo.c

246

This seems redundant with llvm_get_di_tag, maybe it can be dropped?

[tamird]

Split out NFC changes, remove redundant GetDINodeTag call

[tamird]

Rebase

[tamird]

In D154630#4478821, @scott.linder wrote:

Could you split the NFC changes to naming/style from the functional fix to LLVMDITypeGetName and the new test?

Done in https://reviews.llvm.org/D154661.

[tamird]

rebase

[scott.linder]

Thank you again for the fix!

llvm/lib/IR/DebugInfo.cpp

LLVMDIBuilderCreateArtificialType(LLVMDIBuilderRef Builder,
   return wrap(unwrap(Builder)->createArtificialType(unwrapDI<DIType>(Type)));
 }
 
 uint16_t LLVMGetDINodeTag(LLVMMetadataRef MD) {
   return unwrapDI<DINode>(MD)->getTag();
 }
 
 const char *LLVMDITypeGetName(LLVMMetadataRef DType, size_t *Length) {
-  StringRef Str = unwrap<DIType>(DType)->getName();
+  StringRef Str = unwrapDI<DIType>(DType)->getName();
   *Length = Str.size();
   return Str.data();
 }
 
 uint64_t LLVMDITypeGetSizeInBits(LLVMMetadataRef DType) {
   return unwrapDI<DIType>(DType)->getSizeInBits();
 }
 

llvm/test/Bindings/llvm-c/di-type-get-name.ll

+; RUN: llvm-c-test --di-type-get-name < /dev/null
+; This used to trigger an assertion

llvm/tools/llvm-c-test/debuginfo.c

LLVMMetadataRef Struct = LLVMDIBuilderCreateStructType(
       Builder, File, Name, strlen(Name), File, 42, 64, 0,
       LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0);
   assert(LLVMGetDINodeTag(Struct) == 0x13);
   (void)Struct;
 
   LLVMDisposeDIBuilder(Builder);
   LLVMDisposeModule(M);
 
+  return 0;
+}
+
+int llvm_di_type_get_name(void) {
+  LLVMModuleRef M = LLVMModuleCreateWithName("Mod");
+
+  LLVMDIBuilderRef Builder = LLVMCreateDIBuilder(M);
+  const char Filename[] = "metadata.c";
+  const char Directory[] = ".";
+  LLVMMetadataRef File = LLVMDIBuilderCreateFile(
+      Builder, Filename, strlen(Filename), Directory, strlen(Directory));
+  const char Name[] = "TestClass";
+  LLVMMetadataRef Struct = LLVMDIBuilderCreateStructType(
+      Builder, File, Name, strlen(Name), File, 42, 64, 0,
+      LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0);
+
+  size_t Len;
+  const char *TypeName = LLVMDITypeGetName(Struct, &Len);
+  assert(Len == strlen(Name));
+  assert(strncmp(TypeName, Name, Len) == 0);
+  (void)TypeName;
+
+  LLVMDisposeDIBuilder(Builder);
+  LLVMDisposeModule(M);
 
   return 0;
 }

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

 int llvm_calc(void);
 
 // disassemble.c
 int llvm_disassemble(void);
 
 // debuginfo.c
 int llvm_test_dibuilder(void);
 int llvm_get_di_tag(void);
+int llvm_di_type_get_name(void);
 
 // metadata.c
 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);
 
 // object.c

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

static void print_usage(void) {
   fprintf(stderr, "    Read lines of triple, hex ascii machine code from stdin "
                   "- print disassembly\n\n");
   fprintf(stderr, "  * --calc\n");
   fprintf(
       stderr,
       "    Read lines of name, rpn from stdin - print generated module\n\n");
   fprintf(stderr, "  * --get-di-tag\n");
   fprintf(stderr, "    Run test for getting MDNode dwarf tag\n");
+  fprintf(stderr, "  * --di-type-get-name\n");
+  fprintf(stderr, "    Run test for getting MDNode type name\n");
   fprintf(stderr, "  * --replace-md-operand\n");
   fprintf(stderr, "    Run test for replacing MDNode operands\n");
   fprintf(stderr, "  * --is-a-value-as-metadata\n");
   fprintf(stderr,
           "    Run test for checking if LLVMValueRef is a ValueAsMetadata\n");
   fprintf(stderr, "  * --echo\n");
   fprintf(stderr, "    Read bitcode file from stdin - print it back out\n\n");
   fprintf(stderr, "  * --echo --opaque-pointers\n");
int main(int argc, char **argv) {
   } else if (argc == 2 && !strcmp(argv[1], "--calc")) {
     return llvm_calc();
   } else if (argc == 2 && !strcmp(argv[1], "--add-named-metadata-operand")) {
     return llvm_add_named_metadata_operand();
   } else if (argc == 2 && !strcmp(argv[1], "--set-metadata")) {
     return llvm_set_metadata();
   } else if (argc == 2 && !strcmp(argv[1], "--get-di-tag")) {
     return llvm_get_di_tag();
+  } else if (argc == 2 && !strcmp(argv[1], "--di-type-get-name")) {
+    return llvm_di_type_get_name();
   } else if (argc == 2 && !strcmp(argv[1], "--replace-md-operand")) {
     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], "--test-function-attributes")) {
     return llvm_test_function_attributes();
   } else if (argc == 2 && !strcmp(argv[1], "--test-callsite-attributes")) {
     return llvm_test_callsite_attributes();