aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShoaib Meenai <smeenai@fb.com>2024-08-09 13:31:30 -0700
committerShoaib Meenai <smeenai@fb.com>2024-08-09 13:31:30 -0700
commitabfd69b809c9219c053f6e61e9d9e118fed94f3b (patch)
tree09cabcc72fad24306e07f80282645fa84b50c17b
parent5297b750e54dafe16cc13f24b8d5478214e83682 (diff)
downloadllvm-users/smeenai/sprmain.hmaptool-implement-simple-string-deduplication.zip
llvm-users/smeenai/sprmain.hmaptool-implement-simple-string-deduplication.tar.gz
llvm-users/smeenai/sprmain.hmaptool-implement-simple-string-deduplication.tar.bz2
[𝘀𝗽𝗿] changes to main this commit is based onusers/smeenai/sprmain.hmaptool-implement-simple-string-deduplication
Created using spr 1.3.4 [skip ci]
-rwxr-xr-xclang/utils/hmaptool/hmaptool7
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/utils/hmaptool/hmaptool b/clang/utils/hmaptool/hmaptool
index d775463..aa400e3 100755
--- a/clang/utils/hmaptool/hmaptool
+++ b/clang/utils/hmaptool/hmaptool
@@ -192,8 +192,11 @@ def action_write(name, args):
key_idx = len(strtable)
strtable += key + '\0'
- prefix = os.path.dirname(value) + '/'
- suffix = os.path.basename(value)
+ prefix, suffix = os.path.split(value)
+ # This guarantees that prefix + suffix == value in all cases, including when
+ # prefix is empty or contains a trailing slash or suffix is empty (hence the use
+ # of `len(value) - len(suffix)` instead of just `-len(suffix)`.
+ prefix += value[len(prefix) : len(value) - len(suffix)]
prefix_idx = len(strtable)
strtable += prefix + '\0'
suffix_idx = len(strtable)