Skip to content

Commit

Permalink
[CodeGen] Implicitly set stackrealign on the main function, if custom…
Browse files Browse the repository at this point in the history
… stack alignment is used

If using a custom stack alignment, one is expected to make sure
that all callers provide such alignment, or realign the stack in
all entry points (and callbacks).

Despite this, the compiler can assume that the main function will
need realignment in these cases, since the startup routines calling
the main function most probably won't provide the custom alignment.

This matches what GCC does in similar cases; if compiling with
-mincoming-stack-boundary=X -mpreferred-stack-boundary=X, GCC normally
assumes such alignment on entry to a function, but specifically for
the main function still does realignment.

Differential Revision: https://reviews.llvm.org/D51026

llvm-svn: 340334
  • Loading branch information
mstorsjo committed Aug 21, 2018
1 parent 883fe45 commit d39d53b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
7 changes: 7 additions & 0 deletions clang/lib/CodeGen/CodeGenFunction.cpp
Expand Up @@ -979,6 +979,13 @@ void CodeGenFunction::StartFunction(GlobalDecl GD,
if (FD->isMain())
Fn->addFnAttr(llvm::Attribute::NoRecurse);

// If a custom alignment is used, force realigning to this alignment on
// any main function which certainly will need it.
if (const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D))
if ((FD->isMain() || FD->isMSVCRTEntryPoint()) &&
CGM.getCodeGenOpts().StackAlignment)
Fn->addFnAttr("stackrealign");

llvm::BasicBlock *EntryBB = createBasicBlock("entry", CurFn);

// Create a marker to make it easy to insert allocas into the entryblock
Expand Down
19 changes: 19 additions & 0 deletions clang/test/CodeGen/stackrealign-main.c
@@ -0,0 +1,19 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o - -mstack-alignment=64 %s | FileCheck %s

// CHECK-LABEL: define void @other()
// CHECK: [[OTHER:#[0-9]+]]
// CHECK: {
void other(void) {}

// CHECK-LABEL: define i32 @main(
// CHECK: [[MAIN:#[0-9]+]]
// CHECK: {
int main(int argc, char **argv) {
other();
return 0;
}

// CHECK: attributes [[OTHER]] = { noinline nounwind optnone
// CHECK-NOT: "stackrealign"
// CHECK: }
// CHECK: attributes [[MAIN]] = { noinline nounwind optnone {{.*}}"stackrealign"{{.*}} }

0 comments on commit d39d53b

Please sign in to comment.