[PATCH] D122097: [BOLT] AArch64: Emit text objects

[Vladislav Khmelevsky via Phabricator via llvm-commits]

yota9 updated this revision to Diff 418466.
yota9 added a comment.

Rebase


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D122097

Files:
  bolt/lib/Core/BinaryEmitter.cpp
  bolt/lib/Passes/Aligner.cpp
  bolt/test/AArch64/text_data.c


Index: bolt/test/AArch64/text_data.c
===================================================================
--- /dev/null
+++ bolt/test/AArch64/text_data.c
@@ -0,0 +1,22 @@
+// This test checks that the data object located in text section
+// is properly emitted in the new section.
+
+// RUN: %clang %cflags %s -o %t.exe -Wl,-q
+// RUN: llvm-bolt %t.exe -o %t.bolt -lite=0 -use-old-text=0
+// RUN: llvm-objdump -j .text -d --disassemble-symbols=arr %t.bolt | \
+// RUN:   FileCheck %s
+
+// CHECK: {{.*}} <arr>:
+
+#include <stdlib.h>
+
+typedef void (*FooPtr)();
+
+void exitOk() { exit(0); }
+
+__attribute__((section(".text"))) const FooPtr arr[] = {exitOk, NULL};
+
+int main() {
+  arr[0]();
+  return -1;
+}
Index: bolt/lib/Passes/Aligner.cpp
===================================================================
--- bolt/lib/Passes/Aligner.cpp
+++ bolt/lib/Passes/Aligner.cpp
@@ -172,6 +172,20 @@
     else
       alignMaxBytes(BF);
 
+    // Align objects that contains constant islands and no code
+    // to at least 8 bytes.
+    if (!BF.size() && BF.hasIslandsInfo()) {
+      const uint16_t Alignment = BF.getConstantIslandAlignment();
+      if (BF.getAlignment() < Alignment)
+        BF.setAlignment(Alignment);
+
+      if (BF.getMaxAlignmentBytes() < Alignment)
+        BF.setMaxAlignmentBytes(Alignment);
+
+      if (BF.getMaxColdAlignmentBytes() < Alignment)
+        BF.setMaxColdAlignmentBytes(Alignment);
+    }
+
     if (opts::AlignBlocks && !opts::PreserveBlocksAlignment)
       alignBlocks(BF, Emitter.MCE.get());
   };
Index: bolt/lib/Core/BinaryEmitter.cpp
===================================================================
--- bolt/lib/Core/BinaryEmitter.cpp
+++ bolt/lib/Core/BinaryEmitter.cpp
@@ -277,7 +277,7 @@
 }
 
 bool BinaryEmitter::emitFunction(BinaryFunction &Function, bool EmitColdPart) {
-  if (Function.size() == 0)
+  if (Function.size() == 0 && !Function.hasIslandsInfo())
     return false;
 
   if (Function.getState() == BinaryFunction::State::Empty)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122097.418466.patch
Type: text/x-patch
Size: 2000 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220327/8931913e/attachment.bin>