From 73ec065604a8ff2512f478fb763eaa4f9c2bf354 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 16 Dec 2016 19:39:01 +0000 Subject: Revert "[IR] Remove the DIExpression field from DIGlobalVariable." This reverts commit 289920 (again). I forgot to implement a Bitcode upgrade for the case where a DIGlobalVariable has not DIExpression. Unfortunately it is not possible to safely upgrade these variables without adding a flag to the bitcode record indicating which version they are. My plan of record is to roll the planned follow-up patch that adds a unit: field to DIGlobalVariable into this patch before recomitting. This way we only need one Bitcode upgrade for both changes (with a version flag in the bitcode record to safely distinguish the record formats). Sorry for the churn! llvm-svn: 289982 --- llvm/test/Bitcode/diglobalvariable-3.8.ll | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'llvm/test/Bitcode/diglobalvariable-3.8.ll') diff --git a/llvm/test/Bitcode/diglobalvariable-3.8.ll b/llvm/test/Bitcode/diglobalvariable-3.8.ll index f00a2dd86f7..55b3f656c57 100644 --- a/llvm/test/Bitcode/diglobalvariable-3.8.ll +++ b/llvm/test/Bitcode/diglobalvariable-3.8.ll @@ -1,20 +1,8 @@ ; RUN: llvm-dis -o - %s.bc | FileCheck %s -!llvm.dbg.cu = !{!0} -!llvm.module.flags = !{!7, !8} +; CHECK: !0 = distinct !DIGlobalVariable(name: "a", scope: null, isLocal: false, isDefinition: true, expr: !1) +; CHECK: !1 = !DIExpression(DW_OP_constu, 42, DW_OP_stack_value) -; CHECK: !0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.1", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, globals: !3) -!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.1", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, globals: !3) -!1 = !DIFile(filename: "g.c", directory: "/") -!2 = !{} -; CHECK: !3 = !{!4} -!3 = !{!4} -; CHECK: !4 = {{.*}}!DIGlobalVariableExpression(var: !5, expr: !8) -; CHECK: !5 = !DIGlobalVariable(name: "c", scope: !0, file: !1, line: 1, type: !6, isLocal: false, isDefinition: true) -; CHECK: !8 = !DIExpression(DW_OP_constu, 42, DW_OP_stack_value) -!4 = !DIGlobalVariable(name: "c", scope: !0, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, variable: i32 42) -!5 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !6) -!6 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!7 = !{i32 2, !"Dwarf Version", i32 2} -!8 = !{i32 2, !"Debug Info Version", i32 3} +!named = !{!0} +!0 = distinct !DIGlobalVariable(name: "a", variable: i32 42) -- cgit v1.2.3