[llvm] 5ab43c3 - [JITLink] Use continue to reduce loop indentation and improve readability. NFC.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 27 20:06:19 PST 2025
Author: Lang Hames
Date: 2025-01-28T15:06:12+11:00
New Revision: 5ab43c3e7d9b5dc0ca4fffa58c65fc6f7283d3c0
URL: https://github.com/llvm/llvm-project/commit/5ab43c3e7d9b5dc0ca4fffa58c65fc6f7283d3c0
DIFF: https://github.com/llvm/llvm-project/commit/5ab43c3e7d9b5dc0ca4fffa58c65fc6f7283d3c0.diff
LOG: [JITLink] Use continue to reduce loop indentation and improve readability. NFC.
Added:
Modified:
llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
Removed:
################################################################################
diff --git a/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp b/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
index c97cedca81e2b1..8067e2a173a00f 100644
--- a/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/aarch64.cpp
@@ -318,48 +318,49 @@ Error lowerPointer64AuthEdgesToSigningFunction(LinkGraph &G) {
for (auto *B : G.blocks()) {
for (auto &E : B->edges()) {
- if (E.getKind() == aarch64::Pointer64Authenticated) {
- uint64_t EncodedInfo = E.getAddend();
- int32_t RealAddend = (uint32_t)(EncodedInfo & 0xffffffff);
- uint32_t InitialDiscriminator = (EncodedInfo >> 32) & 0xffff;
- bool AddressDiversify = (EncodedInfo >> 48) & 0x1;
- uint32_t Key = (EncodedInfo >> 49) & 0x3;
- uint32_t HighBits = EncodedInfo >> 51;
- auto ValueToSign = E.getTarget().getAddress() + RealAddend;
-
- if (HighBits != 0x1000)
- return make_error<JITLinkError>(
- "Pointer64Auth edge at " +
- formatv("{0:x}", B->getFixupAddress(E).getValue()) +
- " has invalid encoded addend " + formatv("{0:x}", EncodedInfo));
-
- LLVM_DEBUG({
- const char *const KeyNames[] = {"IA", "IB", "DA", "DB"};
- dbgs() << " " << B->getFixupAddress(E) << " <- " << ValueToSign
- << " : key = " << KeyNames[Key] << ", discriminator = "
- << formatv("{0:x4}", InitialDiscriminator)
- << ", address diversified = "
- << (AddressDiversify ? "yes" : "no") << "\n";
- });
-
- // Materialize pointer value.
- cantFail(
- writeMovRegImm64Seq(AppendInstr, Reg1, ValueToSign.getValue()));
-
- // Materialize fixup pointer.
- cantFail(writeMovRegImm64Seq(AppendInstr, Reg2,
- B->getFixupAddress(E).getValue()));
-
- // Write signing instruction(s).
- cantFail(writePACSignSeq(AppendInstr, Reg1, ValueToSign, Reg2, Reg3,
- Key, InitialDiscriminator, AddressDiversify));
-
- // Store signed pointer.
- cantFail(writeStoreRegSeq(AppendInstr, Reg2, Reg1));
-
- // Replace edge with a keep-alive to preserve dependence info.
- E.setKind(Edge::KeepAlive);
- }
+ // We're only concerned with Pointer64Authenticated edges here.
+ if (E.getKind() != aarch64::Pointer64Authenticated)
+ continue;
+
+ uint64_t EncodedInfo = E.getAddend();
+ int32_t RealAddend = (uint32_t)(EncodedInfo & 0xffffffff);
+ uint32_t InitialDiscriminator = (EncodedInfo >> 32) & 0xffff;
+ bool AddressDiversify = (EncodedInfo >> 48) & 0x1;
+ uint32_t Key = (EncodedInfo >> 49) & 0x3;
+ uint32_t HighBits = EncodedInfo >> 51;
+ auto ValueToSign = E.getTarget().getAddress() + RealAddend;
+
+ if (HighBits != 0x1000)
+ return make_error<JITLinkError>(
+ "Pointer64Auth edge at " +
+ formatv("{0:x}", B->getFixupAddress(E).getValue()) +
+ " has invalid encoded addend " + formatv("{0:x}", EncodedInfo));
+
+ LLVM_DEBUG({
+ const char *const KeyNames[] = {"IA", "IB", "DA", "DB"};
+ dbgs() << " " << B->getFixupAddress(E) << " <- " << ValueToSign
+ << " : key = " << KeyNames[Key] << ", discriminator = "
+ << formatv("{0:x4}", InitialDiscriminator)
+ << ", address diversified = "
+ << (AddressDiversify ? "yes" : "no") << "\n";
+ });
+
+ // Materialize pointer value.
+ cantFail(writeMovRegImm64Seq(AppendInstr, Reg1, ValueToSign.getValue()));
+
+ // Materialize fixup pointer.
+ cantFail(writeMovRegImm64Seq(AppendInstr, Reg2,
+ B->getFixupAddress(E).getValue()));
+
+ // Write signing instruction(s).
+ cantFail(writePACSignSeq(AppendInstr, Reg1, ValueToSign, Reg2, Reg3, Key,
+ InitialDiscriminator, AddressDiversify));
+
+ // Store signed pointer.
+ cantFail(writeStoreRegSeq(AppendInstr, Reg2, Reg1));
+
+ // Replace edge with a keep-alive to preserve dependence info.
+ E.setKind(Edge::KeepAlive);
}
}
More information about the llvm-commits
mailing list