[llvm] 683451b - [lit] Fix a few issues in relative_lines.py

[Haojian Wu via llvm-commits]

Author: Haojian Wu
Date: 2022-12-19T19:57:12+01:00
New Revision: 683451bce3d6b61097a5f56598cbc83b5fb52103

URL: https://github.com/llvm/llvm-project/commit/683451bce3d6b61097a5f56598cbc83b5fb52103
DIFF: https://github.com/llvm/llvm-project/commit/683451bce3d6b61097a5f56598cbc83b5fb52103.diff

LOG: [lit] Fix a few issues in relative_lines.py

- fixes error: Line: 91  result += contents[pos:m.start(index)] TypeError: can only concatenate str (not "bytes") to str
- fixes the "-code-completion-at=%s:%(lineb'-7')" rewritten results

Differential Revision: https://reviews.llvm.org/D140300

Added: 
    

Modified: 
    llvm/utils/relative_lines.py

Removed: 
    


################################################################################
diff  --git a/llvm/utils/relative_lines.py b/llvm/utils/relative_lines.py
index 9852da1dff4b..9c3706b77751 100755
--- a/llvm/utils/relative_lines.py
+++ b/llvm/utils/relative_lines.py
@@ -68,23 +68,23 @@ def replace_one(capture, line, offset):
             print(f"{file}:{line}: target line {target} is farther than {args.near}", file=sys.stderr)
             return capture
         if target > line:
-            delta = b('+' + str(target - line))
+            delta = '+' + str(target - line)
         elif target < line:
-            delta = b('-' + str(line - target))
+            delta = '-' + str(line - target)
         else:
-            delta = b''
+            delta = ''
 
         prefix = contents[:offset].rsplit(b'\n')[-1]
         is_lit = b'RUN' in prefix or b'DEFINE' in prefix
-        text = b(('%(line{0})' if is_lit else '[[@LINE{0}]]').format(delta))
+        text = ('%(line{0})' if is_lit else '[[@LINE{0}]]').format(delta)
         if args.verbose:
             print(f"{file}:{line}: {0} ==> {text}")
-        return text
+        return b(text)
 
     def replace_match(m):
         """Text to replace a whole match, e.g. --at=42:3 => --at=%(line+2):3"""
         line = 1 + contents[:m.start()].count(b'\n')
-        result = ''
+        result = b''
         pos = m.start()
         for index, capture in enumerate(m.groups()):
             index += 1 # re groups are conventionally 1-indexed