[llvm-branch-commits] [llvm] 87e99de - Revert DSE workarounds, this was causing some problems in main.

[Tom Stellard via llvm-branch-commits]

Author: Tom Stellard
Date: 2023-05-30T22:11:27-07:00
New Revision: 87e99dec85b65dfc427cf3ad2d0ab9f490165405

URL: https://github.com/llvm/llvm-project/commit/87e99dec85b65dfc427cf3ad2d0ab9f490165405
DIFF: https://github.com/llvm/llvm-project/commit/87e99dec85b65dfc427cf3ad2d0ab9f490165405.diff

LOG: Revert DSE workarounds, this was causing some problems in main.

Revert "[clangd] Fix builds after 4ddae8b941398a6579d3"

This reverts commit ae42196bc493ffe877a7e3dff8be32035dea4d07.

Revert "[clangd] Fix test failure when it's built with compiler flags unknown by clang"

This reverts commit 21f3dfbc26736e4299c154e67065652f48279047.

Revert "[cmake] Disable GCC lifetime DSE"

This reverts commit d5cce0a7781bfbb9322a2e9625c7f88253801148.

Revert "[clang-tidy][test] Add trailing -- to suppress compile_commands.json read"

This reverts commit 57262bbd32c35eb05bac34e39a751abc0466b9da.

Added: 
    

Modified: 
    clang-tools-extra/clangd/test/CMakeLists.txt
    clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
    llvm/cmake/modules/HandleLLVMOptions.cmake

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt
index d073267066e0b..6bb578263ffc8 100644
--- a/clang-tools-extra/clangd/test/CMakeLists.txt
+++ b/clang-tools-extra/clangd/test/CMakeLists.txt
@@ -28,13 +28,6 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   )
 
-# Copy an empty compile_flags.txt to make sure tests don't pick up arbitrary
-# commands from parents.
-file(
-  TOUCH
-  ${CMAKE_CURRENT_BINARY_DIR}/compile_flags.txt
-)
-
 add_lit_testsuite(check-clangd "Running the Clangd regression tests"
   # clangd doesn't put unittest configs in test/unit like every other project.
   # Because of that, this needs to pass two folders here, while every other

diff  --git a/clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
index 2ff3eda559a52..927a0905ee424 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp
@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s performance-trivially-destructible %t
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -fix --
-// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -warnings-as-errors='-*,performance-trivially-destructible' --
+// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -fix
+// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -warnings-as-errors='-*,performance-trivially-destructible'
 
 struct TriviallyDestructible1 {
   int a;

diff  --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 78be03d2bc13a..6119ecdce0f4b 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -582,16 +582,6 @@ if ( LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL" )
   add_flag_if_supported("-Werror=unguarded-availability-new" WERROR_UNGUARDED_AVAILABILITY_NEW)
 endif( LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL" )
 
-if ( LLVM_COMPILER_IS_GCC_COMPATIBLE )
-  # LLVM data structures like llvm::User and llvm::MDNode rely on
-  # the value of object storage persisting beyond the lifetime of the
-  # object (#24952).  This is not standard compliant and causes a runtime
-  # crash if LLVM is built with GCC and LTO enabled (#57740).  Until
-  # these bugs are fixed, we need to disable dead store eliminations
-  # based on object lifetime.
-  add_flag_if_supported("-fno-lifetime-dse" CMAKE_CXX_FLAGS)
-endif ( LLVM_COMPILER_IS_GCC_COMPATIBLE )
-
 # Modules enablement for GCC-compatible compilers:
 if ( LLVM_COMPILER_IS_GCC_COMPATIBLE AND LLVM_ENABLE_MODULES )
   set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})