[clang] 30deabf - [libTooling] Improve error message from failure in selection Stencil
Yitzhak Mandelbaum via cfe-commits
cfe-commits at lists.llvm.org
Fri Jun 26 09:19:23 PDT 2020
Author: Yitzhak Mandelbaum
Date: 2020-06-26T16:17:28Z
New Revision: 30deabf89f93f724315e803ebcb2df09b8d36f2a
URL: https://github.com/llvm/llvm-project/commit/30deabf89f93f724315e803ebcb2df09b8d36f2a
DIFF: https://github.com/llvm/llvm-project/commit/30deabf89f93f724315e803ebcb2df09b8d36f2a.diff
LOG: [libTooling] Improve error message from failure in selection Stencil
This patch improves the error message provided by the stencil that handles
source from a range selector.
Reviewed By: gribozavr2
Differential Revision: https://reviews.llvm.org/D82654
Added:
Modified:
clang/lib/Tooling/Transformer/Stencil.cpp
clang/unittests/Tooling/StencilTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/Tooling/Transformer/Stencil.cpp b/clang/lib/Tooling/Transformer/Stencil.cpp
index 619467383e70..2670bf7adabf 100644
--- a/clang/lib/Tooling/Transformer/Stencil.cpp
+++ b/clang/lib/Tooling/Transformer/Stencil.cpp
@@ -19,6 +19,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/Errc.h"
+#include "llvm/Support/Error.h"
#include <atomic>
#include <memory>
#include <string>
@@ -232,8 +233,31 @@ Error evalData(const SelectorData &Data, const MatchFinder::MatchResult &Match,
return RawRange.takeError();
CharSourceRange Range = Lexer::makeFileCharRange(
*RawRange, *Match.SourceManager, Match.Context->getLangOpts());
+ if (Range.isInvalid()) {
+ // Validate the original range to attempt to get a meaningful error message.
+ // If it's valid, then something else is the cause and we just return the
+ // generic failure message.
+ if (auto Err = tooling::validateEditRange(*RawRange, *Match.SourceManager))
+ return handleErrors(std::move(Err), [](std::unique_ptr<StringError> E) {
+ assert(E->convertToErrorCode() ==
+ llvm::make_error_code(errc::invalid_argument) &&
+ "Validation errors must carry the invalid_argument code");
+ return llvm::createStringError(
+ errc::invalid_argument,
+ "selected range could not be resolved to a valid source range; " +
+ E->getMessage());
+ });
+ return llvm::createStringError(
+ errc::invalid_argument,
+ "selected range could not be resolved to a valid source range");
+ }
+ // Validate `Range`, because `makeFileCharRange` accepts some ranges that
+ // `validateEditRange` rejects.
if (auto Err = tooling::validateEditRange(Range, *Match.SourceManager))
- return Err;
+ return joinErrors(
+ llvm::createStringError(errc::invalid_argument,
+ "selected range is not valid for editing"),
+ std::move(Err));
*Result += tooling::getText(Range, *Match.Context);
return Error::success();
}
diff --git a/clang/unittests/Tooling/StencilTest.cpp b/clang/unittests/Tooling/StencilTest.cpp
index 648c583273a2..c843e33dd0da 100644
--- a/clang/unittests/Tooling/StencilTest.cpp
+++ b/clang/unittests/Tooling/StencilTest.cpp
@@ -428,7 +428,12 @@ TEST_F(StencilTest, CatOfInvalidRangeFails) {
hasArgument(0, expr().bind("arg"))));
ASSERT_TRUE(StmtMatch);
Stencil S = cat(node("arg"));
- EXPECT_THAT_EXPECTED(S->eval(StmtMatch->Result), Failed<StringError>());
+ Expected<std::string> Result = S->eval(StmtMatch->Result);
+ ASSERT_THAT_EXPECTED(Result, Failed<StringError>());
+ llvm::handleAllErrors(Result.takeError(), [](const llvm::StringError &E) {
+ EXPECT_THAT(E.getMessage(), AllOf(HasSubstr("selected range"),
+ HasSubstr("macro expansion")));
+ });
}
TEST(StencilToStringTest, RawTextOp) {
More information about the cfe-commits
mailing list