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

[ELF] Delete peek2 in Lexer (#99790)

Browse Source 
Thanks to Fangrui's change

28045ceab0
so peek2 can be removed.
This commit is contained in:
Hongyu Chen
2024-07-20 16:35:38 -07:00
committed by GitHub
parent ba9b5ff4f7
commit b828c13f3c
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lld/ELF/ScriptParser.cpp
View File

@@ -92,7 +92,7 @@ private:
SymbolAssignment *readSymbolAssignment(StringRef name);
ByteCommand *readByteCommand(StringRef tok);
std::array<uint8_t, 4> readFill();
bool readSectionDirective(OutputSection *cmd, StringRef tok2);
bool readSectionDirective(OutputSection *cmd, StringRef tok);
void readSectionAddressType(OutputSection *cmd);
OutputDesc *readOverlaySectionDescription();
OutputDesc *readOutputSectionDescription(StringRef outSec);
@@ -873,14 +873,11 @@ constexpr std::pair<const char *, unsigned> typeMap[] = {
// Tries to read the special directive for an output section definition which
// can be one of following: "(NOLOAD)", "(COPY)", "(INFO)", "(OVERLAY)", and
// "(TYPE=<value>)".
// Tok1 and Tok2 are next 2 tokens peeked. See comment for
// readSectionAddressType below.
bool ScriptParser::readSectionDirective(OutputSection *cmd, StringRef tok2) {
if (tok2 != "NOLOAD" && tok2 != "COPY" && tok2 != "INFO" &&
tok2 != "OVERLAY" && tok2 != "TYPE")
bool ScriptParser::readSectionDirective(OutputSection *cmd, StringRef tok) {
if (tok != "NOLOAD" && tok != "COPY" && tok != "INFO" && tok != "OVERLAY" &&
tok != "TYPE")
return false;
expect("(");
if (consume("NOLOAD")) {
cmd->type = SHT_NOBITS;
cmd->typeIsSet = true;
@@ -919,19 +916,22 @@ bool ScriptParser::readSectionDirective(OutputSection *cmd, StringRef tok2) {
// https://sourceware.org/binutils/docs/ld/Output-Section-Address.html
// https://sourceware.org/binutils/docs/ld/Output-Section-Type.html
void ScriptParser::readSectionAddressType(OutputSection *cmd) {
if (peek() == "(") {
if (consume("(")) {
// Temporarily set inExpr to support TYPE=<value> without spaces.
SaveAndRestore saved(inExpr, true);
if (readSectionDirective(cmd, peek2()))
if (readSectionDirective(cmd, peek()))
return;
cmd->addrExpr = readExpr();
expect(")");
} else {
cmd->addrExpr = readExpr();
}
cmd->addrExpr = readExpr();
if (peek() == "(") {
if (consume("(")) {
SaveAndRestore saved(inExpr, true);
StringRef tok2 = peek2();
if (!readSectionDirective(cmd, tok2))
setError("unknown section directive: " + tok2);
StringRef tok = peek();
if (!readSectionDirective(cmd, tok))
setError("unknown section directive: " + tok);
}
}