[llvm] [yaml2obj][XOFF] Update yaml2obj for XCOFF to create valid XCOFF files in more cases. (PR #77620)

via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 10 08:49:12 PST 2024


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 1fa18fee72639944291b1300a6995abde9b9f51a 97f907f3a155d3b247d4035bac3e732e5b71b90d -- llvm/include/llvm/ObjectYAML/XCOFFYAML.h llvm/lib/ObjectYAML/XCOFFEmitter.cpp
``````````

</details>

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

``````````diff
diff --git a/llvm/lib/ObjectYAML/XCOFFEmitter.cpp b/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
index 7f78aaf749..7a45dc8a67 100644
--- a/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/XCOFFEmitter.cpp
@@ -115,8 +115,7 @@ bool XCOFFWriter::initRelocations(uint64_t &CurrentOffset) {
           return false;
         }
         CurrentOffset = InitSection.FileOffsetToRelocations;
-      }
-      else
+      } else
         InitSection.FileOffsetToRelocations = CurrentOffset;
       CurrentOffset += UsedSize;
       if (CurrentOffset > MaxRawDataSize) {
@@ -150,21 +149,21 @@ bool XCOFFWriter::initSectionHeaders(uint64_t &CurrentOffset) {
 
     // We cannot compute section addresses in general. We only enforce
     // the rule .data and .bss are consecutive, as are .tdata and .tbss.
-    switch(InitSections[I].Flags) {
-      case XCOFF::STYP_DATA:
-        CurrentDataAddr = InitSections[I].Address + InitSections[I].Size;
-        break;
-      case XCOFF::STYP_BSS:
-        if (!InitSections[I].Address)
-          InitSections[I].Address = CurrentDataAddr;
-        break;
-      case XCOFF::STYP_TDATA:
-        CurrentTDataAddr = InitSections[I].Address + InitSections[I].Size;
-        break;
-      case XCOFF::STYP_TBSS:
-        if (!InitSections[I].Address)
-          InitSections[I].Address = CurrentTDataAddr;
-        break;
+    switch (InitSections[I].Flags) {
+    case XCOFF::STYP_DATA:
+      CurrentDataAddr = InitSections[I].Address + InitSections[I].Size;
+      break;
+    case XCOFF::STYP_BSS:
+      if (!InitSections[I].Address)
+        InitSections[I].Address = CurrentDataAddr;
+      break;
+    case XCOFF::STYP_TDATA:
+      CurrentTDataAddr = InitSections[I].Address + InitSections[I].Size;
+      break;
+    case XCOFF::STYP_TBSS:
+      if (!InitSections[I].Address)
+        InitSections[I].Address = CurrentTDataAddr;
+      break;
     }
 
     if (InitSections[I].SectionData.binary_size()) {
@@ -176,8 +175,8 @@ bool XCOFFWriter::initSectionHeaders(uint64_t &CurrentOffset) {
         }
         CurrentOffset = InitSections[I].FileOffsetToData;
       } else {
-         CurrentOffset = alignTo(CurrentOffset, DefaultSectionAlign);
-         InitSections[I].FileOffsetToData = CurrentOffset;
+        CurrentOffset = alignTo(CurrentOffset, DefaultSectionAlign);
+        InitSections[I].FileOffsetToData = CurrentOffset;
       }
       CurrentOffset += InitSections[I].SectionData.binary_size();
       if (CurrentOffset > MaxRawDataSize) {
@@ -368,9 +367,10 @@ bool XCOFFWriter::assignAddressesAndIndices() {
   // If AuxHeaderSize is specified in the YAML file, we construct
   // an auxiliary header.
   const uint64_t AuxFileHdrSize =
-      Obj.Header.AuxHeaderSize ? *Obj.Header.AuxHeaderSize :
-      !Obj.AuxHeader ? 0 :
-      (Is64Bit ? XCOFF::AuxFileHeaderSize64 : XCOFF::AuxFileHeaderSize32);
+      Obj.Header.AuxHeaderSize ? *Obj.Header.AuxHeaderSize
+      : !Obj.AuxHeader
+          ? 0
+          : (Is64Bit ? XCOFF::AuxFileHeaderSize64 : XCOFF::AuxFileHeaderSize32);
   const uint64_t SecHdrSize =
       Is64Bit ? XCOFF::SectionHeaderSize64 : XCOFF::SectionHeaderSize32;
   uint64_t CurrentOffset =

``````````

</details>


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


More information about the llvm-commits mailing list