Skip to content

[ELF] Remove consumeLabel in ScriptLexer #99567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 24, 2024
Merged

[ELF] Remove consumeLabel in ScriptLexer #99567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b33db9
[lld][ELF] remove `consumeLabel` in ScriptLexer
hongyu-dev Jul 18, 2024
ca5ef7d
Merge branch 'llvm:main' into lld-elf-remove-consumeLabel
hongyu-dev Jul 20, 2024
6ec9adf
[ELF] Moved consume in readSymbols function
hongyu-dev Jul 21, 2024
31a3cd6
[ELF] Updated check location for "local" and "global" for resolving p…
hongyu-dev Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions lld/ELF/ScriptLexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,18 +289,6 @@ bool ScriptLexer::consume(StringRef tok) {
return false;
}

// Consumes Tok followed by ":". Space is allowed between Tok and ":".
bool ScriptLexer::consumeLabel(StringRef tok) {
if (consume((tok + ":").str()))
return true;
if (tokens.size() >= pos + 2 && tokens[pos] == tok &&
tokens[pos + 1] == ":") {
pos += 2;
return true;
}
return false;
}

void ScriptLexer::skip() { (void)next(); }

void ScriptLexer::expect(StringRef expect) {
Expand Down
1 change: 0 additions & 1 deletion lld/ELF/ScriptLexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class ScriptLexer {
void skip();
bool consume(StringRef tok);
void expect(StringRef expect);
bool consumeLabel(StringRef tok);
std::string getCurrentLocation();
MemoryBufferRef getCurrentMB();

Expand Down
4 changes: 2 additions & 2 deletions lld/ELF/ScriptParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,11 +1692,11 @@ ScriptParser::readSymbols() {
while (!errorCount()) {
if (consume("}"))
break;
if (consumeLabel("local")) {
if (consume("local:") || (consume("local") && consume(":"))) {
v = &locals;
continue;
}
if (consumeLabel("global")) {
if (consume("global:") || (consume("global") && consume(":"))) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should check local: and global: below at StringRef tok = next();

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I am confused here why we need check local: and global below StringRef tok = next(); ? if the lexer didn't consume global:, global : , local:, local : , or extern, we do not need do other things for the symbol right? Please correct me if I understand here wrong. Thank you!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Manually inline the two consumeLabel calls
  • Move the expanded body to below, just above next()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I committed the change but I think it's not what you were trying to say? If it is not could you please specify it more?

v = &globals;
continue;
}
Expand Down