[clang-tools-extra] b79ca34 - Revert 7dfff42f019583076c55993d30a63889613922dd as it broke non-Windows builds.

Aaron Ballman via cfe-commits cfe-commits at lists.llvm.org
Sun Jul 19 08:13:12 PDT 2020


Author: Aaron Ballman
Date: 2020-07-19T11:12:39-04:00
New Revision: b79ca34530e88c3a13a9c7afb1df42d7a622e3dd

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

LOG: Revert 7dfff42f019583076c55993d30a63889613922dd as it broke non-Windows builds.

Added: 
    

Modified: 
    clang-tools-extra/clangd/CompileCommands.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/CompileCommands.cpp b/clang-tools-extra/clangd/CompileCommands.cpp
index 6df29bd82319..f6210a43b34e 100644
--- a/clang-tools-extra/clangd/CompileCommands.cpp
+++ b/clang-tools-extra/clangd/CompileCommands.cpp
@@ -354,7 +354,7 @@ llvm::ArrayRef<ArgStripper::Rule> ArgStripper::rulesFor(llvm::StringRef Arg) {
 #define PREFIX(NAME, VALUE) static const char *const NAME[] = VALUE;
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELP, METAVAR, VALUES)                                          \
-  if (DriverID::OPT_##ALIAS != DriverID::OPT_INVALID && !ALIASARGS)            \
+  if (DriverID::OPT_##ALIAS != DriverID::OPT_INVALID && ALIASARGS == nullptr)  \
     AddAlias(DriverID::OPT_##ID, DriverID::OPT_##ALIAS);                       \
   Prefixes[DriverID::OPT_##ID] = PREFIX;
 #include "clang/Driver/Options.inc"


        


More information about the cfe-commits mailing list