From d0b7e4c4642bb88f03b8aafb6e502d5c53d309bb Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 5 Jul 2019 11:45:24 +0000 Subject: [PATCH] Make joined instances of JoinedOrSeparate flags point to the unaliased args, like all other arg types do MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes an 8-year-old regression. r105763 made it so that aliases always refer to the unaliased option – but it missed the "joined" branch of JoinedOrSeparate flags. (r162231 then made the Args classes non-virtual, and r169344 moved them from clang to llvm.) Back then, there was no JoinedOrSeparate flag that was an alias, so it wasn't observable. Now /U in CLCompatOptions is a JoinedOrSeparate alias in clang, and warn_slash_u_filename incorrectly used the aliased arg id (using the unaliased one isn't really a regression since that warning checks if the undefined macro contains slash or backslash and only then emits the warning – and no valid use will pass "-Ufoo/bar" or similar). Also, lld has many JoinedOrSeparate aliases, and due to this bug it had to explicitly call `getUnaliasedOption()` in a bunch of places, even though that shouldn't be necessary by design. After this fix in Option, these calls really don't have an effect any more, so remove them. No intended behavior change. (I accidentally fixed this bug while working on PR29106 but then wondered why the warn_slash_u_filename broke. When I figured it out, I thought it would make sense to land this in a separate commit.) Differential Revision: https://reviews.llvm.org/D64156 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@365186 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Option/Option.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Option/Option.cpp b/lib/Option/Option.cpp index 1e3b5452e3c..a13278ce8e6 100644 --- a/lib/Option/Option.cpp +++ b/lib/Option/Option.cpp @@ -207,7 +207,7 @@ Arg *Option::accept(const ArgList &Args, // FIXME: Avoid strlen. if (ArgSize != strlen(Args.getArgString(Index))) { const char *Value = Args.getArgString(Index) + ArgSize; - return new Arg(*this, Spelling, Index++, Value); + return new Arg(UnaliasedOption, Spelling, Index++, Value); } // Otherwise it must be separate. -- 2.40.0