thakis created this revision. thakis added reviewers: dexonsmith, jansvoboda11. Herald added a subscriber: mgorny. thakis requested review of this revision.
This removes the ability to disable roundtripping in assert builds. (Roundtripping happens by default in assert builds both before and after this patch.) The CLANG_ROUND_TRIP_CC1_ARGS was added as an escape hatch 9 months ago in https://reviews.llvm.org/D97462, with a FIXME to remove it eventually. It's probably time to remove it. https://reviews.llvm.org/D114120 Files: clang/CMakeLists.txt clang/lib/Frontend/CompilerInvocation.cpp Index: clang/lib/Frontend/CompilerInvocation.cpp =================================================================== --- clang/lib/Frontend/CompilerInvocation.cpp +++ clang/lib/Frontend/CompilerInvocation.cpp @@ -624,8 +624,7 @@ CompilerInvocation &DummyInvocation, ArrayRef<const char *> CommandLineArgs, DiagnosticsEngine &Diags, const char *Argv0) { - // FIXME: Switch to '#ifndef NDEBUG' when possible. -#ifdef CLANG_ROUND_TRIP_CC1_ARGS +#ifndef NDEBUG bool DoRoundTripDefault = true; #else bool DoRoundTripDefault = false; Index: clang/CMakeLists.txt =================================================================== --- clang/CMakeLists.txt +++ clang/CMakeLists.txt @@ -462,9 +462,6 @@ option(CLANG_ENABLE_PROTO_FUZZER "Build Clang protobuf fuzzer." OFF) -option(CLANG_ROUND_TRIP_CC1_ARGS - "Round-trip command line arguments in -cc1." ${LLVM_ENABLE_ASSERTIONS}) - if(NOT CLANG_ENABLE_STATIC_ANALYZER AND CLANG_ENABLE_ARCMT) message(FATAL_ERROR "Cannot disable static analyzer while enabling ARCMT or Z3") endif() @@ -473,10 +470,6 @@ set(CLANG_ENABLE_OBJC_REWRITER ON) endif() -if (CLANG_ROUND_TRIP_CC1_ARGS) - add_definitions(-DCLANG_ROUND_TRIP_CC1_ARGS=ON) -endif() - # Clang version information set(CLANG_EXECUTABLE_VERSION "${CLANG_VERSION_MAJOR}" CACHE STRING
Index: clang/lib/Frontend/CompilerInvocation.cpp =================================================================== --- clang/lib/Frontend/CompilerInvocation.cpp +++ clang/lib/Frontend/CompilerInvocation.cpp @@ -624,8 +624,7 @@ CompilerInvocation &DummyInvocation, ArrayRef<const char *> CommandLineArgs, DiagnosticsEngine &Diags, const char *Argv0) { - // FIXME: Switch to '#ifndef NDEBUG' when possible. -#ifdef CLANG_ROUND_TRIP_CC1_ARGS +#ifndef NDEBUG bool DoRoundTripDefault = true; #else bool DoRoundTripDefault = false; Index: clang/CMakeLists.txt =================================================================== --- clang/CMakeLists.txt +++ clang/CMakeLists.txt @@ -462,9 +462,6 @@ option(CLANG_ENABLE_PROTO_FUZZER "Build Clang protobuf fuzzer." OFF) -option(CLANG_ROUND_TRIP_CC1_ARGS - "Round-trip command line arguments in -cc1." ${LLVM_ENABLE_ASSERTIONS}) - if(NOT CLANG_ENABLE_STATIC_ANALYZER AND CLANG_ENABLE_ARCMT) message(FATAL_ERROR "Cannot disable static analyzer while enabling ARCMT or Z3") endif() @@ -473,10 +470,6 @@ set(CLANG_ENABLE_OBJC_REWRITER ON) endif() -if (CLANG_ROUND_TRIP_CC1_ARGS) - add_definitions(-DCLANG_ROUND_TRIP_CC1_ARGS=ON) -endif() - # Clang version information set(CLANG_EXECUTABLE_VERSION "${CLANG_VERSION_MAJOR}" CACHE STRING
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits