This is an archive of the discontinued LLVM Phabricator instance.

[COFF, ARM64] Change setjmp for AArch64 Windows to use Intrinsic.sponentry
ClosedPublic

Authored by yinma on Nov 1 2018, 2:30 PM.

Download Raw Diff

Details

Reviewers

mgrang
eli.friedman
ssijaric
mstorsjo
rnk
compnerd

Commits

rG6cef4e5c87a0: [COFF, ARM64] Change setjmp for AArch64 Windows to use Intrinsic.sponentry
rC346024: [COFF, ARM64] Change setjmp for AArch64 Windows to use Intrinsic.sponentry
rL346024: [COFF, ARM64] Change setjmp for AArch64 Windows to use Intrinsic.sponentry

Summary

ARM64 setjmp expects sp on entry instead of framepointer.

Diff Detail

Repository: rL LLVM

Event Timeline

yinma created this revision.Nov 1 2018, 2:30 PM

Herald added subscribers: cfe-commits, chrib, kristof.beyls, javed.absar. · View Herald TranscriptNov 1 2018, 2:30 PM

re-upload due to the depended llvm patch need rework.

This is exactly the same as D53684, right? You don't need another review.

exactly the same

Since this is the same as D53684, we can go ahead and close this.

This revision is now accepted and ready to land.Nov 2 2018, 11:11 AM

Closed by commit rL346024: [COFF, ARM64] Change setjmp for AArch64 Windows to use Intrinsic.sponentry (authored by mgrang). · Explain WhyNov 2 2018, 11:24 AM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: llvm-commits. · View Herald TranscriptNov 2 2018, 11:24 AM

Revision Contents

Path

Size

cfe/

trunk/

lib/

CodeGen/

CGBuiltin.cpp

7 lines

test/

CodeGen/

ms-setjmp.c

4 lines

Diff 172404

cfe/trunk/lib/CodeGen/CGBuiltin.cpp

This file is larger than 256 KB, so syntax highlighting is disabled by default.

Show First 20 Lines • Show All 705 Lines • ▼ Show 20 Lines	static RValue EmitMSVCRTSetJmp(CodeGenFunction &CGF, MSVCSetJmpKind SJKind,
if (SJKind == MSVCSetJmpKind::_setjmp3) {		if (SJKind == MSVCSetJmpKind::_setjmp3) {
Name = "_setjmp3";		Name = "_setjmp3";
Arg1Ty = CGF.Int32Ty;		Arg1Ty = CGF.Int32Ty;
Arg1 = llvm::ConstantInt::get(CGF.IntTy, 0);		Arg1 = llvm::ConstantInt::get(CGF.IntTy, 0);
IsVarArg = true;		IsVarArg = true;
} else {		} else {
Name = SJKind == MSVCSetJmpKind::_setjmp ? "_setjmp" : "_setjmpex";		Name = SJKind == MSVCSetJmpKind::_setjmp ? "_setjmp" : "_setjmpex";
Arg1Ty = CGF.Int8PtrTy;		Arg1Ty = CGF.Int8PtrTy;
		if (CGF.getTarget().getTriple().getArch() == llvm::Triple::aarch64) {
		Arg1 = CGF.Builder.CreateCall(CGF.CGM.getIntrinsic(Intrinsic::sponentry));
		} else
Arg1 = CGF.Builder.CreateCall(CGF.CGM.getIntrinsic(Intrinsic::frameaddress),		Arg1 = CGF.Builder.CreateCall(CGF.CGM.getIntrinsic(Intrinsic::frameaddress),
llvm::ConstantInt::get(CGF.Int32Ty, 0));		llvm::ConstantInt::get(CGF.Int32Ty, 0));
}		}

// Mark the call site and declaration with ReturnsTwice.		// Mark the call site and declaration with ReturnsTwice.
llvm::Type *ArgTypes[2] = {CGF.Int8PtrTy, Arg1Ty};		llvm::Type *ArgTypes[2] = {CGF.Int8PtrTy, Arg1Ty};
llvm::AttributeList ReturnsTwiceAttr = llvm::AttributeList::get(		llvm::AttributeList ReturnsTwiceAttr = llvm::AttributeList::get(
CGF.getLLVMContext(), llvm::AttributeList::FunctionIndex,		CGF.getLLVMContext(), llvm::AttributeList::FunctionIndex,
llvm::Attribute::ReturnsTwice);		llvm::Attribute::ReturnsTwice);
llvm::Constant *SetJmpFn = CGF.CGM.CreateRuntimeFunction(		llvm::Constant *SetJmpFn = CGF.CGM.CreateRuntimeFunction(
▲ Show 20 Lines • Show All 12,265 Lines • Show Last 20 Lines

cfe/trunk/test/CodeGen/ms-setjmp.c

Show All 19 Lines	int test_setjmp() {
// I386-NEXT: ret i32 %[[call]]		// I386-NEXT: ret i32 %[[call]]

// X64-LABEL: define dso_local i32 @test_setjmp		// X64-LABEL: define dso_local i32 @test_setjmp
// X64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)		// X64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)
// X64: %[[call:.]] = call i32 @_setjmp(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])		// X64: %[[call:.]] = call i32 @_setjmp(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])
// X64-NEXT: ret i32 %[[call]]		// X64-NEXT: ret i32 %[[call]]

// AARCH64-LABEL: define dso_local i32 @test_setjmp		// AARCH64-LABEL: define dso_local i32 @test_setjmp
// AARCH64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)		// AARCH64: %[[addr:.]] = call i8 @llvm.sponentry()
// AARCH64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])		// AARCH64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])
// AARCH64-NEXT: ret i32 %[[call]]		// AARCH64-NEXT: ret i32 %[[call]]
}		}

int test_setjmpex() {		int test_setjmpex() {
return _setjmpex(jb);		return _setjmpex(jb);
// X64-LABEL: define dso_local i32 @test_setjmpex		// X64-LABEL: define dso_local i32 @test_setjmpex
// X64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)		// X64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)
// X64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])		// X64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])
// X64-NEXT: ret i32 %[[call]]		// X64-NEXT: ret i32 %[[call]]

// AARCH64-LABEL: define dso_local i32 @test_setjmpex		// AARCH64-LABEL: define dso_local i32 @test_setjmpex
// AARCH64: %[[addr:.]] = call i8 @llvm.frameaddress(i32 0)		// AARCH64: %[[addr:.]] = call i8 @llvm.sponentry()
// AARCH64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])		// AARCH64: %[[call:.]] = call i32 @_setjmpex(i8 getelementptr inbounds ([1 x i8], [1 x i8]* @jb, i32 0, i32 0), i8* %[[addr]])
// AARCH64-NEXT: ret i32 %[[call]]		// AARCH64-NEXT: ret i32 %[[call]]
}		}