Skip to content

Commit 87e99de

Browse files
committed
Revert DSE workarounds, this was causing some problems in main.
Revert "[clangd] Fix builds after 4ddae8b" This reverts commit ae42196. Revert "[clangd] Fix test failure when it's built with compiler flags unknown by clang" This reverts commit 21f3dfb. Revert "[cmake] Disable GCC lifetime DSE" This reverts commit d5cce0a. Revert "[clang-tidy][test] Add trailing -- to suppress compile_commands.json read" This reverts commit 57262bb.
1 parent 8407887 commit 87e99de

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

clang-tools-extra/clangd/test/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ configure_lit_site_cfg(
2828
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
2929
)
3030

31-
# Copy an empty compile_flags.txt to make sure tests don't pick up arbitrary
32-
# commands from parents.
33-
file(
34-
TOUCH
35-
${CMAKE_CURRENT_BINARY_DIR}/compile_flags.txt
36-
)
37-
3831
add_lit_testsuite(check-clangd "Running the Clangd regression tests"
3932
# clangd doesn't put unittest configs in test/unit like every other project.
4033
# Because of that, this needs to pass two folders here, while every other

clang-tools-extra/test/clang-tidy/checkers/performance/trivially-destructible.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %check_clang_tidy %s performance-trivially-destructible %t
22
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
3-
// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -fix --
4-
// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -warnings-as-errors='-*,performance-trivially-destructible' --
3+
// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -fix
4+
// RUN: clang-tidy %t.cpp -checks='-*,performance-trivially-destructible' -warnings-as-errors='-*,performance-trivially-destructible'
55

66
struct TriviallyDestructible1 {
77
int a;

llvm/cmake/modules/HandleLLVMOptions.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -582,16 +582,6 @@ if ( LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL" )
582582
add_flag_if_supported("-Werror=unguarded-availability-new" WERROR_UNGUARDED_AVAILABILITY_NEW)
583583
endif( LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL" )
584584

585-
if ( LLVM_COMPILER_IS_GCC_COMPATIBLE )
586-
# LLVM data structures like llvm::User and llvm::MDNode rely on
587-
# the value of object storage persisting beyond the lifetime of the
588-
# object (#24952). This is not standard compliant and causes a runtime
589-
# crash if LLVM is built with GCC and LTO enabled (#57740). Until
590-
# these bugs are fixed, we need to disable dead store eliminations
591-
# based on object lifetime.
592-
add_flag_if_supported("-fno-lifetime-dse" CMAKE_CXX_FLAGS)
593-
endif ( LLVM_COMPILER_IS_GCC_COMPATIBLE )
594-
595585
# Modules enablement for GCC-compatible compilers:
596586
if ( LLVM_COMPILER_IS_GCC_COMPATIBLE AND LLVM_ENABLE_MODULES )
597587
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})

0 commit comments

Comments
 (0)