From 2976a606966577634e20d8d287a02a3b15630472 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 17 Jul 2025 20:44:28 -0700 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?= =?UTF-8?q?l=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.6-beta.1 --- llvm/lib/CodeGen/MachineFunction.cpp | 3 +-- llvm/test/CodeGen/X86/function-align.ll | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 llvm/test/CodeGen/X86/function-align.ll diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp index 38ad582ba923c..429a17a9113d3 100644 --- a/llvm/lib/CodeGen/MachineFunction.cpp +++ b/llvm/lib/CodeGen/MachineFunction.cpp @@ -211,9 +211,8 @@ void MachineFunction::init() { ConstantPool = new (Allocator) MachineConstantPool(getDataLayout()); Alignment = STI->getTargetLowering()->getMinFunctionAlignment(); - // FIXME: Shouldn't use pref alignment if explicit alignment is set on F. // FIXME: Use Function::hasOptSize(). - if (!F.hasFnAttribute(Attribute::OptimizeForSize)) + if (!F.getAlign() && !F.hasFnAttribute(Attribute::OptimizeForSize)) Alignment = std::max(Alignment, STI->getTargetLowering()->getPrefFunctionAlignment()); diff --git a/llvm/test/CodeGen/X86/function-align.ll b/llvm/test/CodeGen/X86/function-align.ll new file mode 100644 index 0000000000000..11d0e99929927 --- /dev/null +++ b/llvm/test/CodeGen/X86/function-align.ll @@ -0,0 +1,18 @@ +; RUN: llc -function-sections < %s | FileCheck %s + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +; CHECK: .section .text.f1 +; CHECK-NOT: .p2align +; CHECK: f1: +define void @f1() align 1 { + ret void +} + +; CHECK: .section .text.f2 +; CHECK-NEXT: .globl f2 +; CHECK-NEXT: .p2align 1 +define void @f2() align 2 { + ret void +}