Author: adrian Date: Wed Aug 30 11:22:23 2017 New Revision: 312148 URL: http://llvm.org/viewvc/llvm-project?rev=312148&view=rev Log: Adapt testcases to LLVM change r312144 in DIGlobalVariableExpression
Modified: cfe/trunk/test/CodeGen/2009-10-20-GlobalDebug.c cfe/trunk/test/CodeGen/debug-info-static-const-fp.c cfe/trunk/test/CodeGen/debug-info-static.c cfe/trunk/test/CodeGenCXX/debug-info-static-member.cpp cfe/trunk/test/CodeGenCXX/debug-info-template-member.cpp cfe/trunk/test/CodeGenCXX/debug-info-template.cpp cfe/trunk/test/CodeGenCXX/debug-info.cpp cfe/trunk/test/CodeGenCXX/inline-dllexport-member.cpp cfe/trunk/test/CodeGenOpenCL/amdgpu-debug-info-variable-expression.cl Modified: cfe/trunk/test/CodeGen/2009-10-20-GlobalDebug.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/2009-10-20-GlobalDebug.c?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/2009-10-20-GlobalDebug.c (original) +++ cfe/trunk/test/CodeGen/2009-10-20-GlobalDebug.c Wed Aug 30 11:22:23 2017 @@ -10,11 +10,11 @@ int main() { return 0; } -// CHECK: [[L]] = !DIGlobalVariableExpression(var: [[LV:.*]]) +// CHECK: [[L]] = !DIGlobalVariableExpression(var: [[LV:.*]], expr: !DIExpression()) // CHECK: [[LV]] = distinct !DIGlobalVariable(name: "localstatic" // CHECK-NOT: linkageName: // CHECK-SAME: line: 9, -// CHECK: [[G]] = !DIGlobalVariableExpression(var: [[GV:.*]]) +// CHECK: [[G]] = !DIGlobalVariableExpression(var: [[GV:.*]], expr: !DIExpression()) // CHECK: [[GV]] = distinct !DIGlobalVariable(name: "global" // CHECK-NOT: linkageName: // CHECK-SAME: line: 7, Modified: cfe/trunk/test/CodeGen/debug-info-static-const-fp.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-static-const-fp.c?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/debug-info-static-const-fp.c (original) +++ cfe/trunk/test/CodeGen/debug-info-static-const-fp.c Wed Aug 30 11:22:23 2017 @@ -46,6 +46,6 @@ int main() { // CHECK-SAME: isLocal: true, isDefinition: true // CHECK-LDlg-DAG: [[LDVAL:.*]] = distinct !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true) -// CHECK-LDlg-DAG: !DIGlobalVariableExpression(var: [[LDVAL]]) +// CHECK-LDlg-DAG: !DIGlobalVariableExpression(var: [[LDVAL]], expr: !DIExpression()) // CHECK-LDsm-DAG: [[LDVAL:.*]] = distinct !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true) // CHECK-LDsm-DAG: !DIGlobalVariableExpression(var: [[LDVAL]], expr: Modified: cfe/trunk/test/CodeGen/debug-info-static.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/debug-info-static.c?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/debug-info-static.c (original) +++ cfe/trunk/test/CodeGen/debug-info-static.c Wed Aug 30 11:22:23 2017 @@ -2,7 +2,7 @@ // CHECK: @f.xyzzy = internal global i32 0, align 4, !dbg [[XYZZY:![0-9]+]] -// CHECK: [[XYZZY]] = !DIGlobalVariableExpression(var: [[VAR:.*]]) +// CHECK: [[XYZZY]] = !DIGlobalVariableExpression(var: [[VAR:.*]], expr: !DIExpression()) // CHECK: [[VAR]] = distinct !DIGlobalVariable void f(void) { Modified: cfe/trunk/test/CodeGenCXX/debug-info-static-member.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-static-member.cpp?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-static-member.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info-static-member.cpp Wed Aug 30 11:22:23 2017 @@ -32,7 +32,7 @@ public: // why the definition of "a" comes before the declarations while // "b" and "c" come after. -// CHECK: [[A]] = !DIGlobalVariableExpression(var: [[AV:.*]]) +// CHECK: [[A]] = !DIGlobalVariableExpression(var: [[AV:.*]], expr: !DIExpression()) // CHECK: [[AV]] = distinct !DIGlobalVariable(name: "a", // CHECK-SAME: declaration: ![[DECL_A:[0-9]+]]) // @@ -45,7 +45,7 @@ public: // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "static_decl_templ_var" int C::a = 4; -// CHECK: [[B]] = !DIGlobalVariableExpression(var: [[BV:.*]]) +// CHECK: [[B]] = !DIGlobalVariableExpression(var: [[BV:.*]], expr: !DIExpression()) // CHECK: [[BV]] = distinct !DIGlobalVariable(name: "b", // CHECK-SAME: declaration: ![[DECL_B:[0-9]+]]) // CHECK: ![[DECL_B]] = !DIDerivedType(tag: DW_TAG_member, name: "b" @@ -93,7 +93,7 @@ int C::a = 4; // CHECK-SAME: flags: DIFlagPublic | DIFlagStaticMember) int C::b = 2; -// CHECK: [[C]] = !DIGlobalVariableExpression(var: [[CV:.*]]) +// CHECK: [[C]] = !DIGlobalVariableExpression(var: [[CV:.*]], expr: !DIExpression()) // CHECK: [[CV]] = distinct !DIGlobalVariable(name: "c", {{.*}} declaration: ![[DECL_C]]) int C::c = 1; Modified: cfe/trunk/test/CodeGenCXX/debug-info-template-member.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-template-member.cpp?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-template-member.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info-template-member.cpp Wed Aug 30 11:22:23 2017 @@ -19,7 +19,7 @@ inline int add3(int x) { } // The compile unit pulls in the global variables first. -// CHECK: [[X]] = !DIGlobalVariableExpression(var: [[XV:.*]]) +// CHECK: [[X]] = !DIGlobalVariableExpression(var: [[XV:.*]], expr: !DIExpression()) // CHECK: [[XV]] = distinct !DIGlobalVariable(name: "x", // CHECK-SAME: type: ![[OUTER_FOO_INNER_ID:[0-9]+]] Modified: cfe/trunk/test/CodeGenCXX/debug-info-template.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-template.cpp?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-template.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info-template.cpp Wed Aug 30 11:22:23 2017 @@ -25,7 +25,7 @@ struct TC { int glb; void func(); -// CHECK: [[TCI]] = !DIGlobalVariableExpression(var: [[TCIV:.*]]) +// CHECK: [[TCI]] = !DIGlobalVariableExpression(var: [[TCIV:.*]], expr: !DIExpression()) // CHECK: [[TCIV]] = distinct !DIGlobalVariable(name: "tci", // CHECK-SAME: type: ![[TCNESTED:[0-9]+]] // CHECK: ![[TCNESTED]] ={{.*}}!DICompositeType(tag: DW_TAG_structure_type, name: "nested", @@ -84,7 +84,7 @@ TC // CHECK: [[TCARG7_3]] = !DITemplateValueParameter(type: [[INT]], value: i32 3) 3>::nested tci; -// CHECK: [[TCN]] = !DIGlobalVariableExpression(var: [[TCNV:.*]]) +// CHECK: [[TCN]] = !DIGlobalVariableExpression(var: [[TCNV:.*]], expr: !DIExpression()) // CHECK: [[TCNV]] = distinct !DIGlobalVariable(name: "tcn" // CHECK-SAME: type: ![[TCNT:[0-9]+]] TC @@ -125,7 +125,7 @@ template <template <typename> class tmpl struct NN { }; -// CHECK: [[NN]] = !DIGlobalVariableExpression(var: [[NNV:.*]]) +// CHECK: [[NN]] = !DIGlobalVariableExpression(var: [[NNV:.*]], expr: !DIExpression()) // CHECK: [[NNV]] = distinct !DIGlobalVariable(name: "nn" // CHECK-SAME: type: ![[NNT:[0-9]+]] Modified: cfe/trunk/test/CodeGenCXX/debug-info.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info.cpp?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info.cpp Wed Aug 30 11:22:23 2017 @@ -8,7 +8,7 @@ // !llvm.dbg.cu pulls in globals and their types first. // CHECK-NOT: !DIGlobalVariable(name: "c" -// CHECK: [[X]] = !DIGlobalVariableExpression(var: [[XV:!.*]]) +// CHECK: [[X]] = !DIGlobalVariableExpression(var: [[XV:!.*]], expr: !DIExpression()) // CHECK: [[XV]] = distinct !DIGlobalVariable(name: "x", linkageName: "_ZN6pr96081xE" // CHECK-SAME: type: [[INCARRAYPTR:![0-9]*]] // CHECK: [[INCARRAYPTR]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[INCARRAY:![0-9]+]] Modified: cfe/trunk/test/CodeGenCXX/inline-dllexport-member.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/inline-dllexport-member.cpp?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/inline-dllexport-member.cpp (original) +++ cfe/trunk/test/CodeGenCXX/inline-dllexport-member.cpp Wed Aug 30 11:22:23 2017 @@ -7,7 +7,7 @@ struct __declspec(dllexport) s { static const unsigned int ui = 0; }; -// CHECK: [[UI]] = !DIGlobalVariableExpression(var: [[UIV:.*]]) +// CHECK: [[UI]] = !DIGlobalVariableExpression(var: [[UIV:.*]], expr: !DIExpression()) // CHECK: [[UIV]] = distinct !DIGlobalVariable(name: "ui", linkageName: "\01?ui@s@@2IB", scope: ![[SCOPE:[0-9]+]], // CHECK: ![[SCOPE]] = distinct !DICompileUnit( Modified: cfe/trunk/test/CodeGenOpenCL/amdgpu-debug-info-variable-expression.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/amdgpu-debug-info-variable-expression.cl?rev=312148&r1=312147&r2=312148&view=diff ============================================================================== --- cfe/trunk/test/CodeGenOpenCL/amdgpu-debug-info-variable-expression.cl (original) +++ cfe/trunk/test/CodeGenOpenCL/amdgpu-debug-info-variable-expression.cl Wed Aug 30 11:22:23 2017 @@ -2,51 +2,51 @@ // RUN: %clang -cl-std=CL2.0 -emit-llvm -g -O0 -S -target amdgcn-amd-amdhsa-opencl -mcpu=fiji -o - %s | FileCheck %s // CHECK-DAG: ![[FILEVAR0:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar0", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR0]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR0]], expr: !DIExpression()) global int *FileVar0; // CHECK-DAG: ![[FILEVAR1:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar1", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR1]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR1]], expr: !DIExpression()) constant int *FileVar1; // CHECK-DAG: ![[FILEVAR2:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar2", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR2]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR2]], expr: !DIExpression()) local int *FileVar2; // CHECK-DAG: ![[FILEVAR3:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar3", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR3]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR3]], expr: !DIExpression()) private int *FileVar3; // CHECK-DAG: ![[FILEVAR4:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar4", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR4]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR4]], expr: !DIExpression()) int *FileVar4; // CHECK-DAG: ![[FILEVAR5:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar5", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR5]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR5]], expr: !DIExpression()) global int *global FileVar5; // CHECK-DAG: ![[FILEVAR6:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar6", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR6]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR6]], expr: !DIExpression()) constant int *global FileVar6; // CHECK-DAG: ![[FILEVAR7:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar7", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR7]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR7]], expr: !DIExpression()) local int *global FileVar7; // CHECK-DAG: ![[FILEVAR8:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar8", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR8]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR8]], expr: !DIExpression()) private int *global FileVar8; // CHECK-DAG: ![[FILEVAR9:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar9", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR9]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR9]], expr: !DIExpression()) int *global FileVar9; // CHECK-DAG: ![[FILEVAR10:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar10", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR10]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR10]], expr: !DIExpression()) global int *constant FileVar10 = 0; // CHECK-DAG: ![[FILEVAR11:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar11", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR11]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR11]], expr: !DIExpression()) constant int *constant FileVar11 = 0; // CHECK-DAG: ![[FILEVAR12:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar12", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR12]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR12]], expr: !DIExpression()) local int *constant FileVar12 = 0; // CHECK-DAG: ![[FILEVAR13:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar13", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR13]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR13]], expr: !DIExpression()) private int *constant FileVar13 = 0; // CHECK-DAG: ![[FILEVAR14:[0-9]+]] = distinct !DIGlobalVariable(name: "FileVar14", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: false, isDefinition: true) -// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR14]]) +// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FILEVAR14]], expr: !DIExpression()) int *constant FileVar14 = 0; kernel void kernel1( @@ -79,19 +79,19 @@ kernel void kernel1( int *FuncVar4 = Tmp1; // CHECK-DAG: ![[FUNCVAR5:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar5", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) - // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR5]]) + // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR5]], expr: !DIExpression()) global int *constant FuncVar5 = 0; // CHECK-DAG: ![[FUNCVAR6:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar6", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) - // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR6]]) + // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR6]], expr: !DIExpression()) constant int *constant FuncVar6 = 0; // CHECK-DAG: ![[FUNCVAR7:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar7", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) - // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR7]]) + // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR7]], expr: !DIExpression()) local int *constant FuncVar7 = 0; // CHECK-DAG: ![[FUNCVAR8:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar8", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) - // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR8]]) + // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR8]], expr: !DIExpression()) private int *constant FuncVar8 = 0; // CHECK-DAG: ![[FUNCVAR9:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar9", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) - // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR9]]) + // CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR9]], expr: !DIExpression()) int *constant FuncVar9 = 0; // CHECK-DAG: ![[FUNCVAR10:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar10", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits