caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[llvm] Make TestData compatible with c++20 (#143801)

Browse Source 
The clang-debian-cpp20 buildbot did not like direct initialization
without a matching constructor. This patch adds a new constructor taking
a json::Object that directly initializes the struct fields. We also
update an internal interface for const correctness.

https://lab.llvm.org/buildbot/#/builders/108/builds/13950
This commit is contained in:
Paul Kirth
2025-06-12 08:22:04 -07:00
committed by GitHub
parent e4de74ba11
commit 2e5fb77ce0
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/utils/llvm-test-mustache-spec/llvm-test-mustache-spec.cpp
View File

@@ -146,6 +146,13 @@ static const StringMap<StringSet<>> XFailTestNames = {{
}};
struct TestData {
TestData() = default;
explicit TestData(const json::Object &TestCase)
: TemplateStr(*TestCase.getString("template")),
ExpectedStr(*TestCase.getString("expected")),
Name(*TestCase.getString("name")), Data(TestCase.get("data")),
Partials(TestCase.get("partials")) {}
static Expected<TestData> createTestData(json::Object *TestCase,
StringRef InputFile) {
// If any of the needed elements are missing, we cannot continue.
@@ -157,19 +164,14 @@ struct TestData {
llvm::inconvertibleErrorCode(),
"invalid JSON schema in test file: " + InputFile + "\n");
return TestData{TestCase->getString("template").value(),
TestCase->getString("expected").value(),
TestCase->getString("name").value(), TestCase->get("data"),
TestCase->get("partials")};
return TestData(*TestCase);
}
TestData() = default;
StringRef TemplateStr;
StringRef ExpectedStr;
StringRef Name;
Value *Data;
Value *Partials;
const Value *Data;
const Value *Partials;
};
static void reportTestFailure(const TestData &TD, StringRef ActualStr,
@@ -191,7 +193,7 @@ static void reportTestFailure(const TestData &TD, StringRef ActualStr,
}
}
static void registerPartials(Value *Partials, Template &T) {
static void registerPartials(const Value *Partials, Template &T) {
if (!Partials)
return;
for (const auto &[Partial, Str] : *Partials->getAsObject())