njames93 created this revision.
njames93 added a reviewer: gribozavr2.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
njames93 requested review of this revision.
Rearrange the fields to reduce the size of the classes
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D90127
Files:
clang/include/clang/AST/CommentLexer.h
clang/lib/AST/CommentLexer.cpp
Index: clang/lib/AST/CommentLexer.cpp
===================================================================
--- clang/lib/AST/CommentLexer.cpp
+++ clang/lib/AST/CommentLexer.cpp
@@ -740,11 +740,10 @@
Lexer::Lexer(llvm::BumpPtrAllocator &Allocator, DiagnosticsEngine &Diags,
const CommandTraits &Traits, SourceLocation FileLoc,
- const char *BufferStart, const char *BufferEnd,
- bool ParseCommands)
+ const char *BufferStart, const char *BufferEnd, bool
ParseCommands)
: Allocator(Allocator), Diags(Diags), Traits(Traits),
- BufferStart(BufferStart), BufferEnd(BufferEnd), FileLoc(FileLoc),
- BufferPtr(BufferStart), CommentState(LCS_BeforeComment),
State(LS_Normal),
+ BufferStart(BufferStart), BufferEnd(BufferEnd), BufferPtr(BufferStart),
+ FileLoc(FileLoc), CommentState(LCS_BeforeComment), State(LS_Normal),
ParseCommands(ParseCommands) {}
void Lexer::lex(Token &T) {
Index: clang/include/clang/AST/CommentLexer.h
===================================================================
--- clang/include/clang/AST/CommentLexer.h
+++ clang/include/clang/AST/CommentLexer.h
@@ -66,9 +66,6 @@
/// tokens.
unsigned Length;
- /// Contains text value associated with a token.
- const char *TextPtr;
-
/// Integer value associated with a token.
///
/// If the token is a known command, contains command ID and TextPtr is
@@ -76,6 +73,9 @@
/// contains the length of the string that starts at TextPtr.
unsigned IntVal;
+ /// Contains text value associated with a token.
+ const char *TextPtr;
+
public:
SourceLocation getLocation() const LLVM_READONLY { return Loc; }
void setLocation(SourceLocation SL) { Loc = SL; }
@@ -232,7 +232,6 @@
const char *const BufferStart;
const char *const BufferEnd;
- SourceLocation FileLoc;
const char *BufferPtr;
@@ -240,7 +239,13 @@
/// to newline or BufferEnd, for C comments points to star in '*/'.
const char *CommentEnd;
- enum LexerCommentState {
+ /// If State is LS_VerbatimBlock, contains the name of verbatim end
+ /// command, including command marker.
+ SmallString<16> VerbatimBlockEndCommandName;
+
+ SourceLocation FileLoc;
+
+ enum LexerCommentState : uint8_t {
LCS_BeforeComment,
LCS_InsideBCPLComment,
LCS_InsideCComment,
@@ -250,7 +255,7 @@
/// Low-level lexer state, track if we are inside or outside of comment.
LexerCommentState CommentState;
- enum LexerState {
+ enum LexerState : uint8_t {
/// Lexing normal comment text
LS_Normal,
@@ -276,10 +281,6 @@
/// Current lexing mode.
LexerState State;
- /// If State is LS_VerbatimBlock, contains the name of verbatim end
- /// command, including command marker.
- SmallString<16> VerbatimBlockEndCommandName;
-
/// If true, the commands, html tags, etc will be parsed and reported as
/// separate tokens inside the comment body. If false, the comment text will
/// be parsed into text and newline tokens.
Index: clang/lib/AST/CommentLexer.cpp
===================================================================
--- clang/lib/AST/CommentLexer.cpp
+++ clang/lib/AST/CommentLexer.cpp
@@ -740,11 +740,10 @@
Lexer::Lexer(llvm::BumpPtrAllocator &Allocator, DiagnosticsEngine &Diags,
const CommandTraits &Traits, SourceLocation FileLoc,
- const char *BufferStart, const char *BufferEnd,
- bool ParseCommands)
+ const char *BufferStart, const char *BufferEnd, bool ParseCommands)
: Allocator(Allocator), Diags(Diags), Traits(Traits),
- BufferStart(BufferStart), BufferEnd(BufferEnd), FileLoc(FileLoc),
- BufferPtr(BufferStart), CommentState(LCS_BeforeComment), State(LS_Normal),
+ BufferStart(BufferStart), BufferEnd(BufferEnd), BufferPtr(BufferStart),
+ FileLoc(FileLoc), CommentState(LCS_BeforeComment), State(LS_Normal),
ParseCommands(ParseCommands) {}
void Lexer::lex(Token &T) {
Index: clang/include/clang/AST/CommentLexer.h
===================================================================
--- clang/include/clang/AST/CommentLexer.h
+++ clang/include/clang/AST/CommentLexer.h
@@ -66,9 +66,6 @@
/// tokens.
unsigned Length;
- /// Contains text value associated with a token.
- const char *TextPtr;
-
/// Integer value associated with a token.
///
/// If the token is a known command, contains command ID and TextPtr is
@@ -76,6 +73,9 @@
/// contains the length of the string that starts at TextPtr.
unsigned IntVal;
+ /// Contains text value associated with a token.
+ const char *TextPtr;
+
public:
SourceLocation getLocation() const LLVM_READONLY { return Loc; }
void setLocation(SourceLocation SL) { Loc = SL; }
@@ -232,7 +232,6 @@
const char *const BufferStart;
const char *const BufferEnd;
- SourceLocation FileLoc;
const char *BufferPtr;
@@ -240,7 +239,13 @@
/// to newline or BufferEnd, for C comments points to star in '*/'.
const char *CommentEnd;
- enum LexerCommentState {
+ /// If State is LS_VerbatimBlock, contains the name of verbatim end
+ /// command, including command marker.
+ SmallString<16> VerbatimBlockEndCommandName;
+
+ SourceLocation FileLoc;
+
+ enum LexerCommentState : uint8_t {
LCS_BeforeComment,
LCS_InsideBCPLComment,
LCS_InsideCComment,
@@ -250,7 +255,7 @@
/// Low-level lexer state, track if we are inside or outside of comment.
LexerCommentState CommentState;
- enum LexerState {
+ enum LexerState : uint8_t {
/// Lexing normal comment text
LS_Normal,
@@ -276,10 +281,6 @@
/// Current lexing mode.
LexerState State;
- /// If State is LS_VerbatimBlock, contains the name of verbatim end
- /// command, including command marker.
- SmallString<16> VerbatimBlockEndCommandName;
-
/// If true, the commands, html tags, etc will be parsed and reported as
/// separate tokens inside the comment body. If false, the comment text will
/// be parsed into text and newline tokens.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
