Skip to content

[llvm-lit] Resolve TypeError in built-in cat -v implementation #98363

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.

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 1 commit into from
Jul 18, 2024

Conversation

connieyzhu
Copy link
Contributor

@connieyzhu connieyzhu commented Jul 10, 2024

When using -v in lit's internal implementation of cat, there is a TypeError when the file data is passed into convertToCaretAndMNotation() as a str, because bytearray() requires an encoded string. This patch encodes the str before passing it through bytearray().

Fixed #102374

When using -v in lit's internal implementation of cat, there
is a TypeError when the file data is passed into convertToCaretAndMNotation()
as a str, because bytearray() requires an encoded string. This patch
encodes the str before passing it through bytearray().
Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot
Copy link
Member

llvmbot commented Jul 10, 2024

@llvm/pr-subscribers-testing-tools

Author: Connie (connieyzhu)

Changes

When using -v in lit's internal implementation of cat, there is a TypeError when the file data is passed into convertToCaretAndMNotation() as a str, because bytearray() requires an encoded string. This patch encodes the str before passing it through bytearray().


Full diff: https://github.com/llvm/llvm-project/pull/98363.diff

1 Files Affected:

  • (modified) llvm/utils/lit/lit/builtin_commands/cat.py (+1-1)
diff --git a/llvm/utils/lit/lit/builtin_commands/cat.py b/llvm/utils/lit/lit/builtin_commands/cat.py
index 6fb2152ef9332..d6dbe889cc2b1 100644
--- a/llvm/utils/lit/lit/builtin_commands/cat.py
+++ b/llvm/utils/lit/lit/builtin_commands/cat.py
@@ -10,7 +10,7 @@
 def convertToCaretAndMNotation(data):
     newdata = StringIO()
     if isinstance(data, str):
-        data = bytearray(data)
+        data = bytearray(data.encode())
 
     for intval in data:
         if intval == 9 or intval == 10:

@connieyzhu connieyzhu marked this pull request as draft July 10, 2024 18:15
@connieyzhu connieyzhu marked this pull request as ready for review July 10, 2024 18:19
@connieyzhu
Copy link
Contributor Author

cc: @ilovepi @petrhosek

@ilovepi ilovepi merged commit ef94732 into llvm:main Jul 18, 2024
10 checks passed
Copy link

@connieyzhu Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested
by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as
the builds can include changes from many authors. It is not uncommon for your
change to be included in a build that fails due to someone else's changes, or
infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself.
This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
Summary:
When using -v in lit's internal implementation of cat, there is a
TypeError when the file data is passed into convertToCaretAndMNotation()
as a str, because bytearray() requires an encoded string. This patch
encodes the str before passing it through bytearray().

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250995
@connieyzhu connieyzhu deleted the llvm-cat branch August 1, 2024 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[llvm-lit] TypeError in lit’s built-in cat -v implementation
4 participants