lit] Update internal shell lexer to remove escape on '$' only for double-quoted strings. #156742
+3
−1
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
…ble-quoted strings. PR 156125 removed the escape (backslash) in front of '$' for all quoted strings. It has since been pointed out this should only happen for double-quoted strings. This PR fixes that.
|
@llvm/pr-subscribers-testing-tools Author: None (cmtice) ChangesPR 156125 removed the escape (backslash) in front of '$' for all quoted strings. It has since been pointed out this should only happen for double-quoted strings. This PR fixes that. Full diff: https://github.com/llvm/llvm-project/pull/156742.diff 2 Files Affected:
diff --git a/llvm/utils/lit/lit/ShUtil.py b/llvm/utils/lit/lit/ShUtil.py
index ff151b1e29330..f3778ad23fddf 100644
--- a/llvm/utils/lit/lit/ShUtil.py
+++ b/llvm/utils/lit/lit/ShUtil.py
@@ -117,7 +117,7 @@ def lex_arg_quoted(self, delim):
return str
# LLDB uses "$" at the start of global variable names; it should
# not be escaped nor dropped.
- elif c == "\\" and self.look() == "$":
+ elif c == "\\" and self.look() == "$" and delim == '"':
c = self.eat()
str += c
elif c == "\\" and delim == '"':
diff --git a/llvm/utils/lit/tests/unit/ShUtil.py b/llvm/utils/lit/tests/unit/ShUtil.py
index 877fc007b8678..2904125b084f2 100644
--- a/llvm/utils/lit/tests/unit/ShUtil.py
+++ b/llvm/utils/lit/tests/unit/ShUtil.py
@@ -30,6 +30,8 @@ def test_quoting(self):
self.assertEqual(self.lex(""" a\\ b """, win32Escapes=True), ["a\\", "b"])
self.assertEqual(self.lex('"\\$y = 11"'), ["$y = 11"])
self.assertEqual(self.lex('"expr \\$y = 11"'), ["expr $y = 11"])
+ self.assertEqual(self.lex("'\\$y = 11'"), ["\\$y = 11"])
+ self.assertEqual(self.lex("'expr \\$y = 11'"), ["expr \\$y = 11"])
class TestShParse(unittest.TestCase):
def parse(self, str):
|
boomanaiden154
approved these changes
Sep 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
PR 156125 removed the escape (backslash) in front of '$' for all quoted strings. It has since been pointed out this should only happen for double-quoted strings. This PR fixes that.