[llvm] [BOLT][AArch64] Include constant islands in disassembly (PR #125961)

[via llvm-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 1c4ee0613508a6c0379f9f63a110b0633f78910d ad990670ffe099c20db447f309fbede051b31ca6 --extensions cpp,h -- bolt/include/bolt/Core/BinaryContext.h bolt/include/bolt/Core/BinaryFunction.h bolt/lib/Core/BinaryContext.cpp bolt/lib/Core/BinaryFunction.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/bolt/include/bolt/Core/BinaryContext.h b/bolt/include/bolt/Core/BinaryContext.h
index d75fa5aa8a..8bec1db70e 100644
--- a/bolt/include/bolt/Core/BinaryContext.h
+++ b/bolt/include/bolt/Core/BinaryContext.h
@@ -1437,7 +1437,8 @@ public:
 
   /// Print data when embedded in the instruction stream keeping the format
   /// similar to printInstruction().
-  void printData(raw_ostream &OS, ArrayRef<uint8_t> Data, uint64_t Offset) const;
+  void printData(raw_ostream &OS, ArrayRef<uint8_t> Data,
+                 uint64_t Offset) const;
 
   /// Extract data from the binary corresponding to [Address, Address + Size)
   /// range. Return an empty ArrayRef if the address range does not belong to
diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h
index 18a2cad3cd..942840a762 100644
--- a/bolt/include/bolt/Core/BinaryFunction.h
+++ b/bolt/include/bolt/Core/BinaryFunction.h
@@ -2062,8 +2062,8 @@ public:
 
   /// If there is a constant island in the range [StartOffset, EndOffset),
   /// return its address.
-  std::optional<uint64_t>
-  getIslandInRange(uint64_t StartOffset, uint64_t EndOffset) const;
+  std::optional<uint64_t> getIslandInRange(uint64_t StartOffset,
+                                           uint64_t EndOffset) const;
 
   uint64_t
   estimateConstantIslandSize(const BinaryFunction *OnBehalfOf = nullptr) const {
diff --git a/bolt/lib/Core/BinaryContext.cpp b/bolt/lib/Core/BinaryContext.cpp
index 8fcab1dfde..1327cbc6a6 100644
--- a/bolt/lib/Core/BinaryContext.cpp
+++ b/bolt/lib/Core/BinaryContext.cpp
@@ -1942,8 +1942,8 @@ static void printDebugInfo(raw_ostream &OS, const MCInst &Instruction,
     OS << " discriminator:" << Row.Discriminator;
 }
 
-ArrayRef<uint8_t>
-BinaryContext::extractData(uint64_t Address, uint64_t Size) const {
+ArrayRef<uint8_t> BinaryContext::extractData(uint64_t Address,
+                                             uint64_t Size) const {
   ArrayRef<uint8_t> Res;
 
   const ErrorOr<const BinarySection &> Section = getSectionForAddress(Address);
@@ -1954,13 +1954,14 @@ BinaryContext::extractData(uint64_t Address, uint64_t Size) const {
     return Res;
 
   auto *Bytes =
-    reinterpret_cast<const uint8_t *>(Section->getContents().data());
+      reinterpret_cast<const uint8_t *>(Section->getContents().data());
   return ArrayRef<uint8_t>(Bytes + Address - Section->getAddress(), Size);
 }
 
 void BinaryContext::printData(raw_ostream &OS, ArrayRef<uint8_t> Data,
                               uint64_t Offset) const {
-  DataExtractor DE(Data, AsmInfo->isLittleEndian(), AsmInfo->getCodePointerSize());
+  DataExtractor DE(Data, AsmInfo->isLittleEndian(),
+                   AsmInfo->getCodePointerSize());
   uint64_t DataOffset = 0;
   while (DataOffset + 4 <= Data.size()) {
     OS << format("    %08" PRIx64 ": \t.word\t0x", Offset + DataOffset);
diff --git a/bolt/lib/Core/BinaryFunction.cpp b/bolt/lib/Core/BinaryFunction.cpp
index 400394f2c8..317ade95c5 100644
--- a/bolt/lib/Core/BinaryFunction.cpp
+++ b/bolt/lib/Core/BinaryFunction.cpp
@@ -1070,7 +1070,8 @@ size_t BinaryFunction::getSizeOfDataInCodeAt(uint64_t Offset) const {
 }
 
 std::optional<uint64_t>
-BinaryFunction::getIslandInRange(uint64_t StartOffset, uint64_t EndOffset) const {
+BinaryFunction::getIslandInRange(uint64_t StartOffset,
+                                 uint64_t EndOffset) const {
   if (!Islands)
     return std::nullopt;
 

``````````

</details>


https://github.com/llvm/llvm-project/pull/125961