Author: OCHyams Date: 2022-11-08T18:43:05Z New Revision: 98fa95492f3bbd5befdeb36c88a3ac5ef2740b4e
URL: https://github.com/llvm/llvm-project/commit/98fa95492f3bbd5befdeb36c88a3ac5ef2740b4e DIFF: https://github.com/llvm/llvm-project/commit/98fa95492f3bbd5befdeb36c88a3ac5ef2740b4e.diff LOG: Revert "[Assignment Tracking][7/*] Add assignment tracking functionality to clang" This reverts commit 28f9636edd7d4e5f3eba1e3d0d37ec53d616481f. Bot failure: https://lab.llvm.org/buildbot/#/builders/109/builds/50251 Added: Modified: clang/lib/CodeGen/BackendUtil.cpp Removed: clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp clang/test/CodeGen/assignment-tracking/flag.cpp clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp clang/test/CodeGen/assignment-tracking/nested-scope.cpp clang/test/Driver/assignment-tracking-opts.c ################################################################################ diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index eb444c829381f..f5c125da10da6 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -30,7 +30,6 @@ #include "llvm/CodeGen/SchedulerRegistry.h" #include "llvm/CodeGen/TargetSubtargetInfo.h" #include "llvm/IR/DataLayout.h" -#include "llvm/IR/DebugInfo.h" #include "llvm/IR/IRPrintingPasses.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Module.h" @@ -831,13 +830,6 @@ void EmitAssemblyHelper::RunOptimizationPipeline( SI.registerCallbacks(PIC, &FAM); PassBuilder PB(TM.get(), PTO, PGOOpt, &PIC); - if (CodeGenOpts.EnableAssignmentTracking) { - PB.registerPipelineStartEPCallback( - [&](ModulePassManager &MPM, OptimizationLevel Level) { - MPM.addPass(AssignmentTrackingPass()); - }); - } - // Enable verify-debuginfo-preserve-each for new PM. DebugifyEachInstrumentation Debugify; DebugInfoPerPass DebugInfoBeforePass; diff --git a/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp b/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp deleted file mode 100644 index 244ecdf8971d9..0000000000000 --- a/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \ -// RUN: -emit-llvm -fexperimental-assignment-tracking %s -o - \ -// RUN: | FileCheck %s --implicit-check-not="call void @llvm.dbg" - -// Based on llvm/test/DebugInfo/Generic/track-assignments.ll - check that using -// -Xclang -fexperimental-assignment-tracking results in emitting (or, as it is -// set up currently, telling llvm to create) assignment tracking metadata. -// -// See the original test for more info. - -struct Inner { int A, B; }; -struct Outer { Inner A, B; }; -struct Large { int A[10]; }; -struct LCopyCtor { int A[4]; LCopyCtor(); LCopyCtor(LCopyCtor const &); }; -int Value, Index, Cond; -Inner InnerA, InnerB; -Large L; - -void zeroInit() { int Z[3] = {0, 0, 0}; } -// CHECK-LABEL: define dso_local void @_Z8zeroInitv -// CHECK: %Z = alloca [3 x i32], align 4, !DIAssignID ![[ID_0:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_0:[0-9]+]], metadata !DIExpression(), metadata ![[ID_0]], metadata [3 x i32]* %Z, metadata !DIExpression()) -// CHECK: @llvm.memset.p0i8.i64{{.*}}, !DIAssignID ![[ID_1:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i8 0, metadata ![[VAR_0]], metadata !DIExpression(), metadata ![[ID_1]], metadata i8* %0, metadata !DIExpression()) - -void memcpyInit() { int A[4] = {0, 1, 2, 3}; } -// CHECK-LABEL: define dso_local void @_Z10memcpyInitv -// CHECK: %A = alloca [4 x i32], align 16, !DIAssignID ![[ID_2:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_1:[0-9]+]], metadata !DIExpression(), metadata ![[ID_2]], metadata [4 x i32]* %A, metadata !DIExpression()) -// CHECK: @llvm.memcpy.p0i8.p0i8.i64{{.*}}, !DIAssignID ![[ID_3:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_1]], metadata !DIExpression(), metadata ![[ID_3]], metadata i8* %0, metadata !DIExpression()) - -void setField() { - Outer O; - O.A.B = Value; -} -// CHECK-LABEL: define dso_local void @_Z8setFieldv -// CHECK: %O = alloca %struct.Outer, align 4, !DIAssignID ![[ID_4:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_2:[0-9]+]], metadata !DIExpression(), metadata ![[ID_4]], metadata %struct.Outer* %O, metadata !DIExpression()) -// CHECK: store i32 %0, i32* %B, align 4,{{.*}}!DIAssignID ![[ID_5:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i32 %0, metadata ![[VAR_2]], metadata !DIExpression(DW_OP_LLVM_fragment, 32, 32), metadata ![[ID_5]], metadata i32* %B, metadata !DIExpression()) - -void unknownOffset() { - int A[2]; - A[Index] = Value; -} -// CHECK-LABEL: define dso_local void @_Z13unknownOffsetv -// CHECK: %A = alloca [2 x i32], align 4, !DIAssignID ![[ID_6:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_3:[0-9]+]], metadata !DIExpression(), metadata ![[ID_6]], metadata [2 x i32]* %A, metadata !DIExpression()) - -Inner sharedAlloca() { - if (Cond) { - Inner A = InnerA; - return A; - } else { - Inner B = InnerB; - return B; - } -} -// CHECK-LABEL: define dso_local i64 @_Z12sharedAllocav -// CHECK: %retval = alloca %struct.Inner, align 4, !DIAssignID ![[ID_7:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4:[0-9]+]], metadata !DIExpression(), metadata ![[ID_7]], metadata %struct.Inner* %retval, metadata !DIExpression()) -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5:[0-9]+]], metadata !DIExpression(), metadata ![[ID_7]], metadata %struct.Inner* %retval, metadata !DIExpression()) -// CHECK: if.then: -// CHECK: call void @llvm.memcpy{{.*}}, !DIAssignID ![[ID_8:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4]], metadata !DIExpression(), metadata ![[ID_8]], metadata i8* %1, metadata !DIExpression()) -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5]], metadata !DIExpression(), metadata ![[ID_8]], metadata i8* %1, metadata !DIExpression()) -// CHECK: if.else: -// CHECK: call void @llvm.memcpy{{.*}}, !DIAssignID ![[ID_9:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4]], metadata !DIExpression(), metadata ![[ID_9]], metadata i8* %2, metadata !DIExpression()) -// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5]], metadata !DIExpression(), metadata ![[ID_9]], metadata i8* %2, metadata !DIExpression()) - -Large sret() { - Large X = L; - return X; -} -// CHECK-LABEL: define dso_local void @_Z4sretv -// CHECK: llvm.dbg.declare - -void byval(Large X) {} -// CHECK-LABEL: define dso_local void @_Z5byval5Large -// CHECK: llvm.dbg.declare - -LCopyCtor indirectReturn() { - LCopyCtor R; - return R; -} -// CHECK-LABEL: define dso_local void @_Z14indirectReturnv -// CHECK: call void @llvm.dbg.declare - -// CHECK-DAG: ![[VAR_0]] = !DILocalVariable(name: "Z", -// CHECK-DAG: ![[VAR_1]] = !DILocalVariable(name: "A", -// CHECK-DAG: ![[VAR_2]] = !DILocalVariable(name: "O", -// CHECK-DAG: ![[VAR_3]] = !DILocalVariable(name: "A", -// CHECK-DAG: ![[VAR_4]] = !DILocalVariable(name: "B", -// CHECK-DAG: ![[VAR_5]] = !DILocalVariable(name: "A", diff --git a/clang/test/CodeGen/assignment-tracking/flag.cpp b/clang/test/CodeGen/assignment-tracking/flag.cpp deleted file mode 100644 index 911fa1aca70d8..0000000000000 --- a/clang/test/CodeGen/assignment-tracking/flag.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \ -// RUN: -emit-llvm -fexperimental-assignment-tracking %s -o - \ -// RUN: | FileCheck %s --check-prefixes=FLAG -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \ -// RUN: -emit-llvm %s -o - \ -// RUN: | FileCheck %s --check-prefixes=NO-FLAG - -// Check some assignment-tracking stuff appears in the output when the flag -// -fexperimental-assignment-tracking is used, and that it doesn't when -// the flag is not used (default behaviour: no assignment tracking). - -// FLAG: DIAssignID -// FLAG: dbg.assign - -// NO-FLAG-NOT: DIAssignID -// NO-FLAG-NOT: dbg.assign - -void fun(int a) {} diff --git a/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp b/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp deleted file mode 100644 index 0e11c77f2e933..0000000000000 --- a/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \ -// RUN: -emit-llvm -fexperimental-assignment-tracking %s -o - \ -// RUN: | FileCheck %s - -// Check that the (debug) codegen looks right with assignment tracking -// enabled. Each fragment that is written to should have a dbg.assign that has -// the DIAssignID of the write as an argument. The fragment offset and size -// should match the offset into the base storage and size of the store. Each of -// the scenarios below results in slightly diff erent arguments generated for -// the memcpy. - -// Test write a complete struct field only. -void fragmentWhole() -{ - struct Record { - int num; - char ch; - }; - - Record dest; - char src = '\0'; - __builtin_memcpy(&dest.ch, &src, sizeof(char)); -} -// CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %ch, i8* align 1 %src, i64 1, i1 false), !dbg !{{[0-9]+}}, !DIAssignID ![[memberID:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{[0-9]+}}, metadata !DIExpression(DW_OP_LLVM_fragment, 32, 8), metadata ![[memberID]], metadata i8* %ch, metadata !DIExpression()) - -// Write starting at a field and overlapping part of another. -void fragmentWholeToPartial() -{ - struct Record { - int num1; - int num2; - }; - - Record dest; - char src[5]="\0\0\0\0"; - __builtin_memcpy(&dest.num1, &src, 5); -} -// CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %1, i8* align 1 %2, i64 5, i1 false), !dbg !{{[0-9]+}}, !DIAssignID ![[exceed:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{[0-9]+}}, metadata !DIExpression(DW_OP_LLVM_fragment, 0, 40), metadata ![[exceed]], metadata i8* %1, metadata !DIExpression()) - -// Write starting between fields. -void fragmentPartialToWhole() -{ - struct record { - int num1; - int num2; - int num3; -}; - - record dest; - char src[5]="\0\0\0\0"; - __builtin_memcpy((char*)&(dest.num2) + 3, &src, 5); -} -// CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %add.ptr, i8* align 1 %2, i64 5, i1 false), !dbg !{{[0-9]+}}, !DIAssignID ![[addendID:[0-9]+]] -// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{.*}}, metadata !DIExpression(DW_OP_LLVM_fragment, 56, 40), metadata ![[addendID]], metadata i8* %add.ptr, metadata !DIExpression()) diff --git a/clang/test/CodeGen/assignment-tracking/nested-scope.cpp b/clang/test/CodeGen/assignment-tracking/nested-scope.cpp deleted file mode 100644 index cd8190462e517..0000000000000 --- a/clang/test/CodeGen/assignment-tracking/nested-scope.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \ -// RUN: -emit-llvm -fexperimental-assignment-tracking %s -o - \ -// RUN: | FileCheck %s - -// Check that dbg.assign intrinsics get a !dbg with with the same scope as -// their variable. - -// CHECK: call void @llvm.dbg.assign({{.+}}, metadata [[local:![0-9]+]], {{.+}}, {{.+}}, {{.+}}), !dbg [[dbg:![0-9]+]] -// CHECK-DAG: [[local]] = !DILocalVariable(name: "local", scope: [[scope:![0-9]+]], -// CHECK-DAG: [[dbg]] = !DILocation({{.+}}, scope: [[scope]]) -// CHECK-DAG: [[scope]] = distinct !DILexicalBlock - -void ext(int*); -void fun() { - { - int local; - } -} - diff --git a/clang/test/Driver/assignment-tracking-opts.c b/clang/test/Driver/assignment-tracking-opts.c deleted file mode 100644 index ec739e1ee25ad..0000000000000 --- a/clang/test/Driver/assignment-tracking-opts.c +++ /dev/null @@ -1,10 +0,0 @@ -// RUN: %clang -### -S %s -g -target x86_64-linux-gnu 2>&1 | FileCheck --check-prefix=CHECK-NO-AT %s -// RUN: %clang -### -S %s -g -target x86_64-linux-gnu 2>&1 \ -// RUN: -Xclang -fexperimental-assignment-tracking \ -// RUN: | FileCheck --check-prefix=CHECK-AT %s - -// CHECK-NO-AT-NOT: "-mllvm" "-experimental-assignment-tracking" -// CHECK-NO-AT-NOT: "-fexperimental-assignment-tracking" - -// CHECK-AT: "-mllvm" "-experimental-assignment-tracking" -// CHECK-AT: "-fexperimental-assignment-tracking" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
