Skip to content

Commit eb98aba

Browse files
tamirdslinder1
authored andcommitted
[LLVM-C] Use unwrapDI in LLVMDITypeGetName
This function otherwise crashes. This behavior has been incorrect since its introduction in 260b581 (D46627). Reviewed By: scott.linder Differential Revision: https://reviews.llvm.org/D154630
1 parent 9306352 commit eb98aba

File tree

5 files changed

+33
-1
lines changed

5 files changed

+33
-1
lines changed

llvm/lib/IR/DebugInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@ uint16_t LLVMGetDINodeTag(LLVMMetadataRef MD) {
14871487
}
14881488

14891489
const char *LLVMDITypeGetName(LLVMMetadataRef DType, size_t *Length) {
1490-
StringRef Str = unwrap<DIType>(DType)->getName();
1490+
StringRef Str = unwrapDI<DIType>(DType)->getName();
14911491
*Length = Str.size();
14921492
return Str.data();
14931493
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
; RUN: llvm-c-test --di-type-get-name < /dev/null
2+
; This used to trigger an assertion

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

+25
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,28 @@ int llvm_get_di_tag(void) {
231231

232232
return 0;
233233
}
234+
235+
int llvm_di_type_get_name(void) {
236+
LLVMModuleRef M = LLVMModuleCreateWithName("Mod");
237+
238+
LLVMDIBuilderRef Builder = LLVMCreateDIBuilder(M);
239+
const char Filename[] = "metadata.c";
240+
const char Directory[] = ".";
241+
LLVMMetadataRef File = LLVMDIBuilderCreateFile(
242+
Builder, Filename, strlen(Filename), Directory, strlen(Directory));
243+
const char Name[] = "TestClass";
244+
LLVMMetadataRef Struct = LLVMDIBuilderCreateStructType(
245+
Builder, File, Name, strlen(Name), File, 42, 64, 0,
246+
LLVMDIFlagObjcClassComplete, NULL, NULL, 0, 0, NULL, NULL, 0);
247+
248+
size_t Len;
249+
const char *TypeName = LLVMDITypeGetName(Struct, &Len);
250+
assert(Len == strlen(Name));
251+
assert(strncmp(TypeName, Name, Len) == 0);
252+
(void)TypeName;
253+
254+
LLVMDisposeDIBuilder(Builder);
255+
LLVMDisposeModule(M);
256+
257+
return 0;
258+
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ int llvm_disassemble(void);
3838
// debuginfo.c
3939
int llvm_test_dibuilder(void);
4040
int llvm_get_di_tag(void);
41+
int llvm_di_type_get_name(void);
4142

4243
// metadata.c
4344
int llvm_add_named_metadata_operand(void);

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

+4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ static void print_usage(void) {
4949
" Read lines of name, rpn from stdin - print generated module\n\n");
5050
fprintf(stderr, " * --get-di-tag\n");
5151
fprintf(stderr, " Run test for getting MDNode dwarf tag\n");
52+
fprintf(stderr, " * --di-type-get-name\n");
53+
fprintf(stderr, " Run test for getting MDNode type name\n");
5254
fprintf(stderr, " * --replace-md-operand\n");
5355
fprintf(stderr, " Run test for replacing MDNode operands\n");
5456
fprintf(stderr, " * --is-a-value-as-metadata\n");
@@ -96,6 +98,8 @@ int main(int argc, char **argv) {
9698
return llvm_set_metadata();
9799
} else if (argc == 2 && !strcmp(argv[1], "--get-di-tag")) {
98100
return llvm_get_di_tag();
101+
} else if (argc == 2 && !strcmp(argv[1], "--di-type-get-name")) {
102+
return llvm_di_type_get_name();
99103
} else if (argc == 2 && !strcmp(argv[1], "--replace-md-operand")) {
100104
return llvm_replace_md_operand();
101105
} else if (argc == 2 && !strcmp(argv[1], "--is-a-value-as-metadata")) {

0 commit comments

Comments
 (0)