[ELF] Updated some while conditions with till #100893
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lld-elf Author: Hongyu Chen (yugier) ChangesThis change is based on commit for a cleaner API usage. Thanks to @MaskRay ! Full diff: https://github.com/llvm/llvm-project/pull/100893.diff 1 Files Affected:
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp
index a79a0b34892fc..b80db28764fd3 100644
--- a/lld/ELF/ScriptParser.cpp
+++ b/lld/ELF/ScriptParser.cpp
@@ -957,13 +957,15 @@ OutputDesc *ScriptParser::readOverlaySectionDescription() {
OutputDesc *osd = script->createOutputSection(next(), getCurrentLocation());
osd->osec.inOverlay = true;
expect("{");
- while (!errorCount() && !consume("}")) {
+ while (auto tok = till("}")) {
uint64_t withFlags = 0;
uint64_t withoutFlags = 0;
- if (consume("INPUT_SECTION_FLAGS"))
+ if (tok == "INPUT_SECTION_FLAGS") {
std::tie(withFlags, withoutFlags) = readInputSectionFlags();
+ tok = till("");
+ }
osd->osec.commands.push_back(
- readInputSectionRules(next(), withFlags, withoutFlags));
+ readInputSectionRules(tok, withFlags, withoutFlags));
}
osd->osec.phdrs = readOutputSectionPhdrs();
return osd;
@@ -1090,7 +1092,7 @@ SymbolAssignment *ScriptParser::readProvideHidden(bool provide, bool hidden) {
StringRef name = next(), eq = peek();
if (eq != "=") {
setError("= expected, but got " + next());
- while (!atEOF() && next() != ")")
+ while (till(")"))
;
return nullptr;
}
@@ -1731,15 +1733,11 @@ ScriptParser::readSymbols() {
SmallVector<SymbolVersion, 0> globals;
SmallVector<SymbolVersion, 0> *v = &globals;
- while (!errorCount()) {
- if (consume("}"))
- break;
-
- if (consume("extern")) {
+ while (auto tok = till("}")) {
+ if (tok == "extern") {
SmallVector<SymbolVersion, 0> ext = readVersionExtern();
v->insert(v->end(), ext.begin(), ext.end());
} else {
- StringRef tok = next();
if (tok == "local:" || (tok == "local" && consume(":"))) {
v = &locals;
continue;
|
|
@llvm/pr-subscribers-lld Author: Hongyu Chen (yugier) ChangesThis change is based on commit for a cleaner API usage. Thanks to @MaskRay ! Full diff: https://github.com/llvm/llvm-project/pull/100893.diff 1 Files Affected:
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp
index a79a0b34892fc..b80db28764fd3 100644
--- a/lld/ELF/ScriptParser.cpp
+++ b/lld/ELF/ScriptParser.cpp
@@ -957,13 +957,15 @@ OutputDesc *ScriptParser::readOverlaySectionDescription() {
OutputDesc *osd = script->createOutputSection(next(), getCurrentLocation());
osd->osec.inOverlay = true;
expect("{");
- while (!errorCount() && !consume("}")) {
+ while (auto tok = till("}")) {
uint64_t withFlags = 0;
uint64_t withoutFlags = 0;
- if (consume("INPUT_SECTION_FLAGS"))
+ if (tok == "INPUT_SECTION_FLAGS") {
std::tie(withFlags, withoutFlags) = readInputSectionFlags();
+ tok = till("");
+ }
osd->osec.commands.push_back(
- readInputSectionRules(next(), withFlags, withoutFlags));
+ readInputSectionRules(tok, withFlags, withoutFlags));
}
osd->osec.phdrs = readOutputSectionPhdrs();
return osd;
@@ -1090,7 +1092,7 @@ SymbolAssignment *ScriptParser::readProvideHidden(bool provide, bool hidden) {
StringRef name = next(), eq = peek();
if (eq != "=") {
setError("= expected, but got " + next());
- while (!atEOF() && next() != ")")
+ while (till(")"))
;
return nullptr;
}
@@ -1731,15 +1733,11 @@ ScriptParser::readSymbols() {
SmallVector<SymbolVersion, 0> globals;
SmallVector<SymbolVersion, 0> *v = &globals;
- while (!errorCount()) {
- if (consume("}"))
- break;
-
- if (consume("extern")) {
+ while (auto tok = till("}")) {
+ if (tok == "extern") {
SmallVector<SymbolVersion, 0> ext = readVersionExtern();
v->insert(v->end(), ext.begin(), ext.end());
} else {
- StringRef tok = next();
if (tok == "local:" || (tok == "local" && consume(":"))) {
v = &locals;
continue;
|
|
|
MaskRay
approved these changes
Jul 27, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/2205 Here is the relevant piece of the build log for the reference: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is based on commit for a cleaner API usage. Thanks to @MaskRay !