From 58bae2f9322e656499dc26e8ba7eaabbbda14da7 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Wed, 16 Aug 2017 13:39:07 +0000 Subject: [PATCH] [DI] Every DIGlobalVariable should have a type. I'll make this a verifier check to catch other violations. This commit fixes the tests already in tree. llvm-svn: 311004 --- test/Assembler/diglobalvariable.ll | 5 +++-- test/Linker/odr.ll | 4 ++-- test/Transforms/GlobalMerge/debug-info.ll | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/Assembler/diglobalvariable.ll b/test/Assembler/diglobalvariable.ll index 02dd6289c0a..b4ff508bed6 100644 --- a/test/Assembler/diglobalvariable.ll +++ b/test/Assembler/diglobalvariable.ll @@ -20,5 +20,6 @@ !6 = !DICompositeType(tag: DW_TAG_structure_type, name: "Class", size: 8, align: 8) !7 = !DIDerivedType(tag: DW_TAG_member, name: "mem", flags: DIFlagStaticMember, scope: !6, baseType: !3) -; CHECK: !8 = !DIGlobalVariable(name: "mem", scope: !0, isLocal: false, isDefinition: true, declaration: !7) -!8 = !DIGlobalVariable(name: "mem", scope: !0, declaration: !7) +; CHECK: !8 = !DIGlobalVariable(name: "mem", scope: !0, type: !9, isLocal: false, isDefinition: true, declaration: !7) +!8 = !DIGlobalVariable(name: "mem", scope: !0, declaration: !7, type: !9) +!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) diff --git a/test/Linker/odr.ll b/test/Linker/odr.ll index 4938b2fda67..be1f04765c0 100644 --- a/test/Linker/odr.ll +++ b/test/Linker/odr.ll @@ -11,7 +11,7 @@ source_filename = "test/Linker/odr.ll" !llvm.module.flags = !{!8} !0 = !DIGlobalVariableExpression(var: !1) -!1 = !DIGlobalVariable(name: "c", scope: null, isLocal: false, isDefinition: true) +!1 = !DIGlobalVariable(name: "c", scope: null, isLocal: false, isDefinition: true, type: !9) !2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, isOptimized: false, runtimeVersion: 0, emissionKind: NoDebug, retainedTypes: !4, globals: !7) !3 = !DIFile(filename: "a", directory: "") !4 = !{!5} @@ -19,4 +19,4 @@ source_filename = "test/Linker/odr.ll" !6 = distinct !DISubprogram(name: "b", scope: null, isLocal: false, isDefinition: true, isOptimized: false, unit: !2) !7 = !{!0} !8 = !{i32 2, !"Debug Info Version", i32 3} - +!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) diff --git a/test/Transforms/GlobalMerge/debug-info.ll b/test/Transforms/GlobalMerge/debug-info.ll index 8d60f366243..1f324f38c12 100644 --- a/test/Transforms/GlobalMerge/debug-info.ll +++ b/test/Transforms/GlobalMerge/debug-info.ll @@ -14,17 +14,17 @@ define void @use1() { ret void } ; CHECK: [[A]] = !DIGlobalVariableExpression(var: [[AVAR:![0-9]+]]) -; CHECK: [[AVAR]] = !DIGlobalVariable(name: "a", scope: null, isLocal: false, isDefinition: true) +; CHECK: [[AVAR]] = !DIGlobalVariable(name: "a", scope: null, type: !2, isLocal: false, isDefinition: true) ; CHECK: [[B]] = !DIGlobalVariableExpression(var: [[BVAR:![0-9]+]], expr: [[EXPR:![0-9]+]]) -; CHECK: [[BVAR]] = !DIGlobalVariable(name: "b", scope: null, isLocal: false, isDefinition: true) +; CHECK: [[BVAR]] = !DIGlobalVariable(name: "b", scope: null, type: !2, isLocal: false, isDefinition: true) ; CHECK: [[EXPR]] = !DIExpression(DW_OP_plus_uconst, 4) !llvm.module.flags = !{!4, !5} !0 = !DIGlobalVariableExpression(var: !1) -!1 = !DIGlobalVariable(name: "a", scope: null, isLocal: false, isDefinition: true) +!1 = !DIGlobalVariable(name: "a", scope: null, type: !6, isLocal: false, isDefinition: true) !2 = !DIGlobalVariableExpression(var: !3) -!3 = !DIGlobalVariable(name: "b", scope: null, isLocal: false, isDefinition: true) +!3 = !DIGlobalVariable(name: "b", scope: null, type: !6, isLocal: false, isDefinition: true) !4 = !{i32 2, !"Debug Info Version", i32 3} !5 = !{i32 2, !"Dwarf Version", i32 4} - +!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)