[lld] Initialize SingleStringMatcher::ExactMatch #123138
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
Created using spr 1.3.4
Member
|
@llvm/pr-subscribers-objectyaml @llvm/pr-subscribers-lld Author: Vitaly Buka (vitalybuka) ChangesIt was not set false in all branches. Full diff: https://github.com/llvm/llvm-project/pull/123138.diff 1 Files Affected:
diff --git a/lld/Common/Strings.cpp b/lld/Common/Strings.cpp
index 41cbbf36f38cb0..8e1a8ce212878f 100644
--- a/lld/Common/Strings.cpp
+++ b/lld/Common/Strings.cpp
@@ -19,10 +19,13 @@
using namespace llvm;
using namespace lld;
-SingleStringMatcher::SingleStringMatcher(StringRef Pattern) {
- if (Pattern.size() > 2 && Pattern.starts_with("\"") &&
- Pattern.ends_with("\"")) {
- ExactMatch = true;
+static bool isExact(StringRef Pattern) {
+ return Pattern.size() > 2 && Pattern.starts_with("\"") &&
+ Pattern.ends_with("\"");
+}
+
+SingleStringMatcher::SingleStringMatcher(StringRef Pattern) : ExactMatch(isExact(Pattern)) {
+ if (ExactMatch) {
ExactPattern = Pattern.substr(1, Pattern.size() - 2);
} else {
Expected<GlobPattern> Glob = GlobPattern::create(Pattern);
@@ -30,7 +33,6 @@ SingleStringMatcher::SingleStringMatcher(StringRef Pattern) {
error(toString(Glob.takeError()) + ": " + Pattern);
return;
}
- ExactMatch = false;
GlobPatternMatcher = *Glob;
}
}
|
Member
|
@llvm/pr-subscribers-lld-elf Author: Vitaly Buka (vitalybuka) ChangesIt was not set false in all branches. Full diff: https://github.com/llvm/llvm-project/pull/123138.diff 1 Files Affected:
diff --git a/lld/Common/Strings.cpp b/lld/Common/Strings.cpp
index 41cbbf36f38cb0..8e1a8ce212878f 100644
--- a/lld/Common/Strings.cpp
+++ b/lld/Common/Strings.cpp
@@ -19,10 +19,13 @@
using namespace llvm;
using namespace lld;
-SingleStringMatcher::SingleStringMatcher(StringRef Pattern) {
- if (Pattern.size() > 2 && Pattern.starts_with("\"") &&
- Pattern.ends_with("\"")) {
- ExactMatch = true;
+static bool isExact(StringRef Pattern) {
+ return Pattern.size() > 2 && Pattern.starts_with("\"") &&
+ Pattern.ends_with("\"");
+}
+
+SingleStringMatcher::SingleStringMatcher(StringRef Pattern) : ExactMatch(isExact(Pattern)) {
+ if (ExactMatch) {
ExactPattern = Pattern.substr(1, Pattern.size() - 2);
} else {
Expected<GlobPattern> Glob = GlobPattern::create(Pattern);
@@ -30,7 +33,6 @@ SingleStringMatcher::SingleStringMatcher(StringRef Pattern) {
error(toString(Glob.takeError()) + ": " + Pattern);
return;
}
- ExactMatch = false;
GlobPatternMatcher = *Glob;
}
}
|
fmayer
approved these changes
Jan 15, 2025
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
Created using spr 1.3.4 [skip ci]
vitalybuka
deleted the
users/vitalybuka/spr/lld-initialize-singlestringmatcherexactmatch
branch
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.
It was not set false in all branches.