This is an archive of the discontinued LLVM Phabricator instance.

Differential D158925

[clang-format][NFC] Skip stability test if input is pre-formatted
ClosedPublic

Authored by owenpan on Aug 26 2023, 3:28 AM.

Details

Reviewers
rymiel
HazardyKnusperkeks
MyDeveloperDay
Commits
rGc8521451708a: [clang-format][NFC] Skip stability test if input is pre-formatted
Summary

This shortens the run-time of FormatTests by about 10% on average (and by up to 50% if formatting would not change the input).

Diff Detail

Event Timeline

owenpan created this revision.Aug 26 2023, 3:28 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptAug 26 2023, 3:28 AM
Herald added reviewers: rymiel, HazardyKnusperkeks, MyDeveloperDay. · View Herald Transcript
Herald added a subscriber: cfe-commits. · View Herald Transcript
owenpan requested review of this revision.Aug 26 2023, 3:28 AM
Harbormaster completed remote builds in B255067: Diff 553714.Aug 26 2023, 3:59 AM
owenpan added inline comments.Aug 26 2023, 12:05 PM
clang/unittests/Format/FormatTestBase.h
88–92

Will fix it before landing.

HazardyKnusperkeks accepted this revision.Aug 26 2023, 1:29 PM
This revision is now accepted and ready to land.Aug 26 2023, 1:29 PM
Closed by commit rGc8521451708a: [clang-format][NFC] Skip stability test if input is pre-formatted (authored by owenpan). · Explain WhyAug 26 2023, 2:48 PM
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rGc8521451708a: [clang-format][NFC] Skip stability test if input is pre-formatted.

Revision Contents

PathSize
clang/
unittests/
Format/
8 lines

Diff 553765

clang/unittests/Format/FormatTestBase.h

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines FormatStyle getTextProtoStyleWithColumns(unsigned ColumnLimit) {
return Style; return Style;
} }
void _verifyFormat(const char *File, int Line, llvm::StringRef Expected, void _verifyFormat(const char *File, int Line, llvm::StringRef Expected,
llvm::StringRef Code, llvm::StringRef Code,
const std::optional<FormatStyle> &Style = {}, const std::optional<FormatStyle> &Style = {},
const std::vector<tooling::Range> &Ranges = {}) { const std::vector<tooling::Range> &Ranges = {}) {
testing::ScopedTrace t(File, Line, ::testing::Message() << Code.str()); testing::ScopedTrace t(File, Line, ::testing::Message() << Code.str());
if (Expected != Code) {
EXPECT_EQ(Expected.str(), EXPECT_EQ(Expected.str(),
format(Expected, Style, SC_ExpectComplete, Ranges)) format(Expected, Style, SC_ExpectComplete, Ranges))
<< "Expected code is not stable"; << "Expected code is not stable";
}
owenpanAuthorUnsubmitted
Done
ReplyInline Actions
testing::ScopedTrace t(File, Line, ::testing::Message() << Code.str());
- if (!Expected.equals(Code)) {
+ if (Expected != Code) {
EXPECT_EQ(Expected.str(),

Will fix it before landing.

owenpan: Will fix it before landing.
EXPECT_EQ(Expected.str(), format(Code, Style, SC_ExpectComplete, Ranges)); EXPECT_EQ(Expected.str(), format(Code, Style, SC_ExpectComplete, Ranges));
auto UsedStyle = Style ? Style.value() : getDefaultStyle(); auto UsedStyle = Style ? Style.value() : getDefaultStyle();
if (UsedStyle.Language == FormatStyle::LK_Cpp) { if (UsedStyle.Language == FormatStyle::LK_Cpp) {
// Objective-C++ is a superset of C++, so everything checked for C++ // Objective-C++ is a superset of C++, so everything checked for C++
// needs to be checked for Objective-C++ as well. // needs to be checked for Objective-C++ as well.
FormatStyle ObjCStyle = UsedStyle; FormatStyle ObjCStyle = UsedStyle;
ObjCStyle.Language = FormatStyle::LK_ObjC; ObjCStyle.Language = FormatStyle::LK_ObjC;
// FIXME: Additional messUp is superfluous. // FIXME: Additional messUp is superfluous.
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines