This is an archive of the discontinued LLVM Phabricator instance.

Differential D121559

[clang-format] Fix crash on asm block with label
ClosedPublic

Authored by HazardyKnusperkeks on Mar 13 2022, 2:15 PM.

Details

Reviewers
owenpan
MyDeveloperDay
curdeius
Commits
rG35abbf166d4a: [clang-format] Fix crash on asm block with label
Summary

Fixes https://github.com/llvm/llvm-project/issues/54349

Diff Detail

Event Timeline

HazardyKnusperkeks created this revision.Mar 13 2022, 2:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2022, 2:15 PM
HazardyKnusperkeks requested review of this revision.Mar 13 2022, 2:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2022, 2:15 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
HazardyKnusperkeks added a parent revision: D121558: [clang-format][NFC] Left renamed to OpeningBrace....Mar 13 2022, 2:15 PM
Harbormaster completed remote builds in B154006: Diff 414958.Mar 13 2022, 2:16 PM
curdeius accepted this revision.Mar 13 2022, 2:30 PM
This revision is now accepted and ready to land.Mar 13 2022, 2:30 PM
owenpan accepted this revision.Mar 13 2022, 5:36 PM
owenpan added inline comments.
clang/lib/Format/TokenAnnotator.cpp
829
clang/unittests/Format/TokenAnnotatorTest.cpp
613
owenpan added a comment.Mar 13 2022, 8:51 PM

This patch also fixed 4 out of 6 of the same assertion failures on the .c files under clang/test. The remaining two are:

  1. Analysis/inline-plist.c (#54367)
  2. Sema/attr-external-source-symbol.c (54368)
HazardyKnusperkeks marked 2 inline comments as done.Mar 14 2022, 4:42 AM
This revision was landed with ongoing or failed builds.Mar 14 2022, 4:45 AM
Closed by commit rG35abbf166d4a: [clang-format] Fix crash on asm block with label (authored by HazardyKnusperkeks). · Explain Why
This revision was automatically updated to reflect the committed changes.
HazardyKnusperkeks added a commit: rG35abbf166d4a: [clang-format] Fix crash on asm block with label.

Revision Contents

PathSize
clang/
lib/
Format/
4 lines
unittests/
Format/
10 lines

Diff 415068

clang/lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 818 Lines • ▼ Show 20 Lines while (CurrentToken) {
(!Contexts.back().ColonIsDictLiteral || !Style.isCpp())) || (!Contexts.back().ColonIsDictLiteral || !Style.isCpp())) ||
Style.Language == FormatStyle::LK_Proto || Style.Language == FormatStyle::LK_Proto ||
Style.Language == FormatStyle::LK_TextProto) { Style.Language == FormatStyle::LK_TextProto) {
OpeningBrace.setType(TT_DictLiteral); OpeningBrace.setType(TT_DictLiteral);
if (Previous->Tok.getIdentifierInfo() || if (Previous->Tok.getIdentifierInfo() ||
Previous->is(tok::string_literal)) Previous->is(tok::string_literal))
Previous->setType(TT_SelectorName); Previous->setType(TT_SelectorName);
} }
if (CurrentToken->is(tok::colon) || Style.isJavaScript()) if (CurrentToken->is(tok::colon) && OpeningBrace.is(TT_Unknown))
OpeningBrace.setType(TT_DictLiteral); OpeningBrace.setType(TT_DictLiteral);
else if (Style.isJavaScript())
owenpanUnsubmitted
Done
ReplyInline Actions
OpeningBrace.setType(TT_DictLiteral);
- if (Style.isJavaScript())
+ else if (Style.isJavaScript())
OpeningBrace.overwriteFixedType(TT_DictLiteral);
owenpan:
OpeningBrace.overwriteFixedType(TT_DictLiteral);
} }
if (CurrentToken->is(tok::comma)) { if (CurrentToken->is(tok::comma)) {
if (Style.isJavaScript()) if (Style.isJavaScript())
OpeningBrace.overwriteFixedType(TT_DictLiteral); OpeningBrace.overwriteFixedType(TT_DictLiteral);
++CommaCount; ++CommaCount;
} }
if (!consumeToken()) if (!consumeToken())
return false; return false;
▲ Show 20 Lines • Show All 3,801 Lines • Show Last 20 Lines

clang/unittests/Format/TokenAnnotatorTest.cpp

Show First 20 Lines • Show All 596 Lines • ▼ Show 20 Lines for (auto I = 0u; I < NumberOfBaseTokens; ++I)
if (I < NumberOfTokensBeforeRequires) if (I < NumberOfTokensBeforeRequires)
EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I; EXPECT_EQ(*BaseTokens[I], *ConstrainedTokens[I]) << I;
else else
EXPECT_EQ(*BaseTokens[I], EXPECT_EQ(*BaseTokens[I],
*ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens]) *ConstrainedTokens[I + NumberOfAdditionalRequiresClauseTokens])
<< I; << I;
} }
TEST_F(TokenAnnotatorTest, UnderstandsAsm) {
auto Tokens = annotate("__asm{\n"
"a:\n"
"};");
ASSERT_EQ(Tokens.size(), 7u) << Tokens;
EXPECT_TOKEN(Tokens[0], tok::kw_asm, TT_Unknown);
EXPECT_TOKEN(Tokens[1], tok::l_brace, TT_InlineASMBrace);
EXPECT_TOKEN(Tokens[4], tok::r_brace, TT_InlineASMBrace);
}
owenpanUnsubmitted
Done
ReplyInline Actions
EXPECT_TOKEN(Tokens[4], tok::r_brace, TT_InlineASMBrace);
}
+
} // namespace
owenpan:
} // namespace } // namespace
} // namespace format } // namespace format
} // namespace clang } // namespace clang