Skip to content

Commit

Permalink
Fix the lowering issue of intrinsics llvm.localaddress on X86
Browse files Browse the repository at this point in the history
Patch by Yuanke Luo

Reviewers: craig.topper, annita.zhang, smaslov, rnk, wxiao3

Reviewed By: rnk

Subscribers: efriedma, llvm-commits

Tags: #llvm

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

llvm-svn: 353492
  • Loading branch information
topperc committed Feb 8, 2019
1 parent cef4c29 commit 738180c
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 2 deletions.
9 changes: 7 additions & 2 deletions llvm/lib/Target/X86/X86ISelLowering.cpp
Expand Up @@ -22558,8 +22558,13 @@ SDValue X86TargetLowering::LowerINTRINSIC_WO_CHAIN(SDValue Op,
unsigned Reg;
if (RegInfo->hasBasePointer(MF))
Reg = RegInfo->getBaseRegister();
else // This function handles the SP or FP case.
Reg = RegInfo->getPtrSizedFrameRegister(MF);
else { // Handles the SP or FP case.
bool CantUseFP = RegInfo->needsStackRealignment(MF);
if (CantUseFP)
Reg = RegInfo->getPtrSizedStackRegister(MF);
else
Reg = RegInfo->getPtrSizedFrameRegister(MF);
}
return DAG.getCopyFromReg(DAG.getEntryNode(), dl, Reg, VT);
}
}
Expand Down
9 changes: 9 additions & 0 deletions llvm/lib/Target/X86/X86RegisterInfo.cpp
Expand Up @@ -762,3 +762,12 @@ X86RegisterInfo::getPtrSizedFrameRegister(const MachineFunction &MF) const {
FrameReg = getX86SubSuperRegister(FrameReg, 32);
return FrameReg;
}

unsigned
X86RegisterInfo::getPtrSizedStackRegister(const MachineFunction &MF) const {
const X86Subtarget &Subtarget = MF.getSubtarget<X86Subtarget>();
unsigned StackReg = getStackRegister();
if (Subtarget.isTarget64BitILP32())
StackReg = getX86SubSuperRegister(StackReg, 32);
return StackReg;
}
1 change: 1 addition & 0 deletions llvm/lib/Target/X86/X86RegisterInfo.h
Expand Up @@ -130,6 +130,7 @@ class X86RegisterInfo final : public X86GenRegisterInfo {
// Debug information queries.
unsigned getFrameRegister(const MachineFunction &MF) const override;
unsigned getPtrSizedFrameRegister(const MachineFunction &MF) const;
unsigned getPtrSizedStackRegister(const MachineFunction &MF) const;
unsigned getStackRegister() const { return StackPtr; }
unsigned getBaseRegister() const { return BasePtr; }
/// Returns physical register used as frame pointer.
Expand Down
78 changes: 78 additions & 0 deletions llvm/test/CodeGen/X86/seh-localaddress.ll
@@ -0,0 +1,78 @@
; RUN: llc -mtriple x86_64-pc-windows-msvc -o - %s | FileCheck %s

; struct S { int x; };
; void foo() {
; struct S __declspec(align(32)) o;
; __try { o.x; }
; __finally { o.x; }
; }
; void bar() {
; struct S o;
; __try { o.x; }
; __finally { o.x; }
; }

%struct.S = type { i32 }

define dso_local void @"?foo@@YAXXZ"() #0 {
entry:
; CHECK-LABEL: foo
; CHECK: movq %rsp, %rdx
; CHECK-NOT: movq %rbp, %rdx

%o = alloca %struct.S, align 32
call void (...) @llvm.localescape(%struct.S* %o)
%x = getelementptr inbounds %struct.S, %struct.S* %o, i32 0, i32 0
%0 = call i8* @llvm.localaddress()
call void @"?fin$0@0@foo@@"(i8 0, i8* %0)
ret void
}

; void bar(void)
; {
; int x;
; void (*fn)(int);
;
; __try {
; x = 1;
; fn(x);
; } __finally {
; x = 2;
; }
; }

define dso_local void @"?bar@@YAXXZ"() personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*) {
entry:
; CHECK-LABEL: bar
; CHECK: movq %rbp, %rdx
; CHECK-NOT: movq %rsp, %rdx
%x = alloca i32, align 4
%fn = alloca void (i32)*, align 8
call void (...) @llvm.localescape(i32* %x)
store i32 1, i32* %x, align 4
%0 = load void (i32)*, void (i32)** %fn, align 8
%1 = load i32, i32* %x, align 4
invoke void %0(i32 %1)
to label %invoke.cont unwind label %ehcleanup
invoke.cont: ; preds = %entry
%2 = call i8* @llvm.localaddress()
call void @"?fin$0@0@bar@@"(i8 0, i8* %2)
ret void
ehcleanup: ; preds = %entry
%3 = cleanuppad within none []
%4 = call i8* @llvm.localaddress()
call void @"?fin$0@0@bar@@"(i8 1, i8* %4) [ "funclet"(token %3) ]
cleanupret from %3 unwind to caller
}

declare void @"?fin$0@0@foo@@"(i8 %abnormal_termination, i8* %frame_pointer)

declare void @"?fin$0@0@bar@@"(i8 %abnormal_termination, i8* %frame_pointer)

declare i8* @llvm.localrecover(i8*, i8*, i32)

declare i8* @llvm.localaddress()

declare void @llvm.localescape(...)

declare dso_local i32 @__C_specific_handler(...)

0 comments on commit 738180c

Please sign in to comment.