[clang] 78b0689 - [Assignment Tracking] Follow up for D147129 - fix broken clang tests

[via cfe-commits]

Author: OCHyams
Date: 2023-03-29T13:54:10+01:00
New Revision: 78b0689ff289f3ab52d5a90fc782d556c05f21ed

URL: https://github.com/llvm/llvm-project/commit/78b0689ff289f3ab52d5a90fc782d556c05f21ed
DIFF: https://github.com/llvm/llvm-project/commit/78b0689ff289f3ab52d5a90fc782d556c05f21ed.diff

LOG: [Assignment Tracking] Follow up for D147129 - fix broken clang tests

D147129 causes the assignment tracking pass to skip optnone functions, which
ends up overriding the "-fexperimental-assignment-tracking=forced" option at
O0. Add -disable-O0-optnone to the tests so that optnone doesn't interfere.

Buildbot example: https://lab.llvm.org/buildbot/#/builders/216/builds/18986

Added: 
    

Modified: 
    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

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp b/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp
index 2e3045754471..b96ad7ca6fac 100644
--- a/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp
+++ b/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \
 // RUN:     -emit-llvm  -fexperimental-assignment-tracking=forced %s -o -        \
+// RUN:     -disable-O0-optnone                                                  \
 // RUN: | FileCheck %s --implicit-check-not="call void @llvm.dbg"
 
 // Based on llvm/test/DebugInfo/Generic/track-assignments.ll - check that using

diff  --git a/clang/test/CodeGen/assignment-tracking/flag.cpp b/clang/test/CodeGen/assignment-tracking/flag.cpp
index 9da6f01e9cfa..aa1f054dae4d 100644
--- a/clang/test/CodeGen/assignment-tracking/flag.cpp
+++ b/clang/test/CodeGen/assignment-tracking/flag.cpp
@@ -16,11 +16,11 @@
 //// Disabled at O0 unless forced.
 // RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone   \
 // RUN:     -emit-llvm %s -o - -fexperimental-assignment-tracking=enabled      \
-// RUN:     -O0                                                                \
+// RUN:     -O0 -disable-O0-optnone                                           \
 // RUN: | FileCheck %s --check-prefixes=DISABLE
 // RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone   \
 // RUN:     -emit-llvm %s -o - -fexperimental-assignment-tracking=forced       \
-// RUN:     -O0                                                                \
+// RUN:     -O0 -disable-O0-optnone                                            \
 // RUN: | FileCheck %s --check-prefixes=ENABLE
 
 //// Disabled for LTO and thinLTO unless forced.

diff  --git a/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp b/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp
index 14e4d84e4683..126bc8f54eb4 100644
--- a/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp
+++ b/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \
 // RUN:     -emit-llvm  -fexperimental-assignment-tracking=forced %s -o -        \
+// RUN:     -disable-O0-optnone                                                  \
 // RUN: | FileCheck %s
 
 // Check that the (debug) codegen looks right with assignment tracking

diff  --git a/clang/test/CodeGen/assignment-tracking/nested-scope.cpp b/clang/test/CodeGen/assignment-tracking/nested-scope.cpp
index 431bf04f1280..d94e42a139c1 100644
--- a/clang/test/CodeGen/assignment-tracking/nested-scope.cpp
+++ b/clang/test/CodeGen/assignment-tracking/nested-scope.cpp
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone -O0 \
 // RUN:     -emit-llvm  -fexperimental-assignment-tracking=forced %s -o -        \
+// RUN:     -disable-O0-optnone                                                  \
 // RUN: | FileCheck %s
 
 // Check that dbg.assign intrinsics get a !dbg with with the same scope as