================
@@ -0,0 +1,106 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "RedundantConstCheck.h"
+#include "../utils/LexerUtils.h"
+#include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
+#include <optional>
+
+using namespace clang::ast_matchers;
+
+namespace clang::tidy::readability {
+
+static const internal::VariadicDynCastAllOfMatcher<Decl, VarTemplateDecl>
+ VarTemplateDecl;
+
+static std::optional<Token>
+findConstToRemove(const VarDecl *VD, const MatchFinder::MatchResult &Result) {
+ const SourceManager &SM = *Result.SourceManager;
+
+ const SourceLocation NameBeginLoc = VD->getQualifier()
+ ? VD->getQualifierLoc().getBeginLoc()
+ : VD->getLocation();
+
+ const bool IsPointer = VD->getType()->isPointerType() ||
+ VD->getType()->isNullPtrType() ||
+ VD->getType()->isMemberPointerType();
+
+ const auto ConstSearchStartLoc = [&]() -> std::optional<SourceLocation> {
+ if (!IsPointer)
+ return VD->getBeginLoc();
+
+ SourceLocation StarLoc = utils::lexer::findPreviousTokenKind(
+ NameBeginLoc, SM, Result.Context->getLangOpts(), tok::star);
+
+ if (StarLoc.isValid())
+ return StarLoc;
+
+ // We know it is a pointer but cannot find the start token.
+ // This can happen when either type is aliased or `auto` was used.
+ // e.g: constexpr const auto const str = "hello";
+ // In cases like this, clang analyzer already warns about the use of const
+ // as duplicate, so we can safely ignore these cases.
+
+ return std::nullopt;
+ }();
+
+ if (!ConstSearchStartLoc || !ConstSearchStartLoc->isValid())
+ return std::nullopt;
----------------
localspook wrote:
This is maybe a style preference, but I would prefer this shorter version:
```suggestion
// If the 'findPreviousTokenKind' below fails,
// we know it is a pointer but cannot find the start token.
// This can happen when either type is aliased or `auto` was used.
// e.g: constexpr const auto const str = "hello";
// In cases like this, clang analyzer already warns about the use of const
// as duplicate, so we can safely ignore these cases.
const SourceLocation ConstSearchStartLoc = !IsPointer
? VD->getBeginLoc()
: utils::lexer::findPreviousTokenKind(
NameBeginLoc, SM, Result.Context->getLangOpts(), tok::star);
if (ConstSearchStartLoc->isInvalid())
return std::nullopt;
```
https://github.com/llvm/llvm-project/pull/189733
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
