[PATCH] D70859: [BUG-FIX][XCOFF] fixed a bug of XCOFFObjectFile.cpp when there is padding at the last csect of a sections

[Digger via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG98f5f022f0cb: [BUG-FIX][XCOFF] fixed a bug of XCOFFObjectFile.cpp when there is padding at… (authored by DiggerLin).

Changed prior to commit:
  https://reviews.llvm.org/D70859?vs=232941&id=233114#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D70859/new/

https://reviews.llvm.org/D70859

Files:
  llvm/lib/MC/XCOFFObjectWriter.cpp
  llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-str.ll


Index: llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-str.ll
===================================================================
--- llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-str.ll
+++ llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-str.ll
@@ -8,7 +8,20 @@
 ; RUN: llc -verify-machineinstrs -mcpu=pwr7 \
 ; RUN:     -mtriple powerpc64-ibm-aix-xcoff < %s | FileCheck %s
 
+; RUN: llc -verify-machineinstrs -mcpu=pwr7 -mtriple powerpc-ibm-aix-xcoff -filetype=obj -o %t.o < %s
+; RUN: llvm-objdump -D %t.o | FileCheck --check-prefix=CHECKOBJ %s
+
 @strA = private unnamed_addr constant [14 x i8] c"hello world!\0A\00", align 1
+ at .str = private unnamed_addr constant [9 x i8] c"abcdefgh\00", align 1
+ at p = global i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str, i32 0, i32 0), align 4
+
+; Function Attrs: noinline nounwind optnone
+define i8 @foo() #0 {
+entry:
+  %0 = load i8*, i8** @p, align 4
+  %1 = load i8, i8* %0, align 1
+  ret i8 %1
+}
 
 ; CHECK:      .csect .rodata.str1.1[RO]
 ; CHECK-NEXT: .LstrA:
@@ -26,3 +39,24 @@
 ; CHECK-NEXT: .byte   33
 ; CHECK-NEXT: .byte   10
 ; CHECK-NEXT: .byte   0
+; CHECK-NEXT: .L.str:
+; CHECK-NEXT: .byte   97
+; CHECK-NEXT: .byte   98
+; CHECK-NEXT: .byte   99
+; CHECK-NEXT: .byte   100
+; CHECK-NEXT: .byte   101
+; CHECK-NEXT: .byte   102
+; CHECK-NEXT: .byte   103
+; CHECK-NEXT: .byte   104
+; CHECK-NEXT: .byte   0
+
+; CHECKOBJ: 00000010 .rodata.str1.1:
+; CHECKOBJ-NEXT:       10: 68 65 6c 6c                   xori 5, 3, 27756
+; CHECKOBJ-NEXT:       14: 6f 20 77 6f                   xoris 0, 25, 30575
+; CHECKOBJ-NEXT:       18: 72 6c 64 21                   andi. 12, 19, 25633
+; CHECKOBJ-NEXT:       1c: 0a 00 61 62                   tdlti   0, 24930{{[[:space:]] *}}
+; CHECKOBJ-NEXT: 0000001e .L.str:
+; CHECKOBJ-NEXT:       1e: 61 62 63 64                   ori 2, 11, 25444
+; CHECKOBJ-NEXT:       22: 65 66 67 68                   oris 6, 11, 26472
+; CHECKOBJ-NEXT:       26: 00                            <unknown>
+; CHECKOBJ-NEXT:       27: 00                            <unknown>
Index: llvm/lib/MC/XCOFFObjectWriter.cpp
===================================================================
--- llvm/lib/MC/XCOFFObjectWriter.cpp
+++ llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -363,7 +363,7 @@
       continue;
 
     assert(CurrentAddressLocation == Section->Address &&
-           "We should have no padding between sections.");
+           "Sections should be written consecutively.");
     for (const auto *Group : Section->Groups) {
       for (const auto &Csect : *Group) {
         if (uint32_t PaddingSize = Csect.Address - CurrentAddressLocation)
@@ -378,8 +378,10 @@
     // the current section minus the the end virtual address of the last csect
     // in that section.
     if (uint32_t PaddingSize =
-            Section->Address + Section->Size - CurrentAddressLocation)
+            Section->Address + Section->Size - CurrentAddressLocation) {
       W.OS.write_zeros(PaddingSize);
+      CurrentAddressLocation += PaddingSize;
+    }
   }
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70859.233114.patch
Type: text/x-patch
Size: 3030 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191210/87464ad9/attachment.bin>