diff options
| author | Adrian Prantl <aprantl@apple.com> | 2016-12-16 19:39:01 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2016-12-16 19:39:01 +0000 |
| commit | 73ec065604a8ff2512f478fb763eaa4f9c2bf354 (patch) | |
| tree | 51d4abac2d0ddd62eff9bc43ea30b15d3486fa48 /llvm/test/LTO | |
| parent | d0fffd1d1405823e4dc1a4ad16e007e3bdd4bf69 (diff) | |
| download | bcm5719-llvm-73ec065604a8ff2512f478fb763eaa4f9c2bf354.tar.gz bcm5719-llvm-73ec065604a8ff2512f478fb763eaa4f9c2bf354.zip | |
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
Diffstat (limited to 'llvm/test/LTO')
| -rw-r--r-- | llvm/test/LTO/X86/Inputs/type-mapping-src.ll | 2 | ||||
| -rw-r--r-- | llvm/test/LTO/X86/type-mapping-bug.ll | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/test/LTO/X86/Inputs/type-mapping-src.ll b/llvm/test/LTO/X86/Inputs/type-mapping-src.ll index 7019dbb6402..3a80560a448 100644 --- a/llvm/test/LTO/X86/Inputs/type-mapping-src.ll +++ b/llvm/test/LTO/X86/Inputs/type-mapping-src.ll @@ -9,7 +9,7 @@ target triple = "x86_64-pc-windows-msvc18.0.0" !llvm.dbg.cu = !{!1} !llvm.module.flags = !{!12} -!0 = !DIGlobalVariableExpression(var: !DIGlobalVariable(name: "bar", linkageName: "bar", scope: !1, file: !2, line: 2, type: !5, isLocal: false, isDefinition: true)) +!0 = distinct !DIGlobalVariable(name: "bar", linkageName: "bar", scope: !1, file: !2, line: 2, type: !5, isLocal: false, isDefinition: true) !1 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !2, producer: "", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !3, globals: !4) !2 = !DIFile(filename: "b", directory: "/") !3 = !{} diff --git a/llvm/test/LTO/X86/type-mapping-bug.ll b/llvm/test/LTO/X86/type-mapping-bug.ll index 7df328f2c37..c2aeb8817ec 100644 --- a/llvm/test/LTO/X86/type-mapping-bug.ll +++ b/llvm/test/LTO/X86/type-mapping-bug.ll @@ -36,7 +36,7 @@ target triple = "x86_64-pc-windows-msvc18.0.0" !2 = !DIFile(filename: "a", directory: "/") !3 = !{} !4 = !{!5} -!5 = !DIGlobalVariableExpression(var: !DIGlobalVariable(name: "foo", linkageName: "foo", scope: !1, file: !2, line: 5, type: !6, isLocal: false, isDefinition: true)) +!5 = distinct !DIGlobalVariable(name: "foo", linkageName: "foo", scope: !1, file: !2, line: 5, type: !6, isLocal: false, isDefinition: true) !6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !2, line: 5, size: 8, elements: !7, identifier: ".?AUS@@") !7 = !{!8} !8 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !6, baseType: !9) |
