[ADT][bugfix] Fixed extra leading zero in uhextostr #141097
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
fixed bug: if fixed-width mode uhextostr() is used with value zero, it prints extra '0' character.
|
@llvm/pr-subscribers-llvm-adt Author: Bushev Dmitry (dybv-sc) Changesfixed bug: if fixed-width mode uhextostr() is used with value zero, it prints extra '0' character. Full diff: https://github.com/llvm/llvm-project/pull/141097.diff 2 Files Affected:
diff --git a/llvm/include/llvm/ADT/StringExtras.h b/llvm/include/llvm/ADT/StringExtras.h
index a2cc36dd8caad..7d81c63485be2 100644
--- a/llvm/include/llvm/ADT/StringExtras.h
+++ b/llvm/include/llvm/ADT/StringExtras.h
@@ -179,7 +179,8 @@ inline std::string utohexstr(uint64_t X, bool LowerCase = false,
char Buffer[17];
char *BufPtr = std::end(Buffer);
- if (X == 0) *--BufPtr = '0';
+ if (X == 0 && !Width)
+ *--BufPtr = '0';
for (unsigned i = 0; Width ? (i < Width) : X; ++i) {
unsigned char Mod = static_cast<unsigned char>(X) & 15;
diff --git a/llvm/unittests/ADT/StringExtrasTest.cpp b/llvm/unittests/ADT/StringExtrasTest.cpp
index 36908a98aa2ae..fbaed38da5943 100644
--- a/llvm/unittests/ADT/StringExtrasTest.cpp
+++ b/llvm/unittests/ADT/StringExtrasTest.cpp
@@ -144,6 +144,7 @@ TEST(StringExtrasTest, ToAndFromHex) {
}
TEST(StringExtrasTest, UINT64ToHex) {
+ EXPECT_EQ(utohexstr(0x0u, false, 2), "00");
EXPECT_EQ(utohexstr(0xA0u), "A0");
EXPECT_EQ(utohexstr(0xA0u, false, 4), "00A0");
EXPECT_EQ(utohexstr(0xA0u, false, 8), "000000A0");
|
|
@dwblaikie, @kuhar - ping |
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Jun 3, 2025
fixed bug: if fixed-width mode uhextostr() is used with value zero, it prints extra '0' character.
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.
fixed bug: if fixed-width mode uhextostr() is used with value zero, it prints extra '0' character.