Skip to content

Commit 3beb910

Browse files
committed
Address review comments
1 parent f5e0db1 commit 3beb910

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

llvm/test/tools/llvm-readobj/ELF/AArch64/aarch64-feature-pauth.s

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# RUN: rm -rf %t && split-file %s %t && cd %t
22

33
#--- gnu-42-1.s
4-
54
.section ".note.gnu.property", "a"
65
.long 4 // Name length is always 4 ("GNU")
76
.long end - begin // Data length
@@ -45,7 +44,6 @@ end:
4544
# OBJ-NEXT: ]
4645

4746
#--- gnu-0-0.s
48-
4947
.section ".note.gnu.property", "a"
5048
.long 4 // Name length is always 4 ("GNU")
5149
.long end - begin // Data length
@@ -68,7 +66,6 @@ end:
6866
# RUN: FileCheck --check-prefix=OBJ -DPLATFORM="0x0 (invalid)" -DVERSION=0x0 %s
6967

7068
#--- gnu-1-0.s
71-
7269
.section ".note.gnu.property", "a"
7370
.long 4 // Name length is always 4 ("GNU")
7471
.long end - begin // Data length
@@ -91,7 +88,6 @@ end:
9188
# RUN: FileCheck --check-prefix=OBJ -DPLATFORM="0x1 (baremetal)" -DVERSION=0x0 %s
9289

9390
#--- gnu-0x10000002-85.s
94-
9591
.section ".note.gnu.property", "a"
9692
.long 4 // Name length is always 4 ("GNU")
9793
.long end - begin // Data length
@@ -116,7 +112,6 @@ end:
116112
# RUN: -DVERSION="0x55 (PointerAuthIntrinsics, !PointerAuthCalls, PointerAuthReturns, !PointerAuthAuthTraps, PointerAuthVTPtrAddressDiscrimination, !PointerAuthVTPtrTypeDiscrimination, PointerAuthInitFini)" %s
117113

118114
#--- gnu-0x10000002-128.s
119-
120115
.section ".note.gnu.property", "a"
121116
.long 4 // Name length is always 4 ("GNU")
122117
.long end - begin // Data length
@@ -139,7 +134,6 @@ end:
139134
# RUN: FileCheck --check-prefix=OBJ -DPLATFORM="0x10000002 (llvm_linux)" -DVERSION="0x80 (unknown)" %s
140135

141136
#--- gnu-short.s
142-
143137
.section ".note.gnu.property", "a"
144138
.long 4 // Name length is always 4 ("GNU")
145139
.long end - begin // Data length
@@ -185,7 +179,6 @@ end:
185179
# OBJ-ERR-NEXT: ]
186180

187181
#--- gnu-long.s
188-
189182
.section ".note.gnu.property", "a"
190183
.long 4 // Name length is always 4 ("GNU")
191184
.long end - begin // Data length

llvm/tools/llvm-readobj/ELFDumper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5156,12 +5156,12 @@ static bool printAArch64PAuthABICoreInfo(raw_ostream &OS, uint32_t DataSize,
51565156
"Update when new enum items are defined");
51575157

51585158
std::string Desc;
5159-
for (uint32_t I = 0; I < Flags.size(); ++I) {
5159+
for (uint32_t I = 0, End = Flags.size(); I < End; ++I) {
51605160
if (!(Version & (1 << I)))
51615161
Desc += '!';
5162-
Desc += Twine("PointerAuth" + Flags[I] + ", ").str();
5162+
Desc +=
5163+
Twine("PointerAuth" + Flags[I] + (I == End - 1 ? "" : ", ")).str();
51635164
}
5164-
Desc.resize(Desc.size() - 2); // Trim last ", "
51655165
return Desc;
51665166
}();
51675167

0 commit comments

Comments
 (0)