Author: aaboud Date: Mon Mar 7 08:22:46 2016 New Revision: 262830 URL: http://llvm.org/viewvc/llvm-project?rev=262830&view=rev Log: Resolved Bug 26414. https://llvm.org/bugs/show_bug.cgi?id=26414 Since interrupt handler must be returned with iret, tail call can't be used.
Differential Revision: http://reviews.llvm.org/D17853 Modified: cfe/trunk/lib/CodeGen/CGCall.cpp cfe/trunk/test/CodeGen/attr-x86-interrupt.c Modified: cfe/trunk/lib/CodeGen/CGCall.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=262830&r1=262829&r2=262830&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCall.cpp (original) +++ cfe/trunk/lib/CodeGen/CGCall.cpp Mon Mar 7 08:22:46 2016 @@ -1451,6 +1451,7 @@ void CodeGenModule::ConstructAttributeLi const Decl *TargetDecl = CalleeInfo.getCalleeDecl(); + bool HasAnyX86InterruptAttr = false; // FIXME: handle sseregparm someday... if (TargetDecl) { if (TargetDecl->hasAttr<ReturnsTwiceAttr>()) @@ -1488,6 +1489,7 @@ void CodeGenModule::ConstructAttributeLi if (TargetDecl->hasAttr<ReturnsNonNullAttr>()) RetAttrs.addAttribute(llvm::Attribute::NonNull); + HasAnyX86InterruptAttr = TargetDecl->hasAttr<AnyX86InterruptAttr>(); HasOptnone = TargetDecl->hasAttr<OptimizeNoneAttr>(); } @@ -1527,10 +1529,11 @@ void CodeGenModule::ConstructAttributeLi } bool DisableTailCalls = - CodeGenOpts.DisableTailCalls || + CodeGenOpts.DisableTailCalls || HasAnyX86InterruptAttr || (TargetDecl && TargetDecl->hasAttr<DisableTailCallsAttr>()); - FuncAttrs.addAttribute("disable-tail-calls", - llvm::toStringRef(DisableTailCalls)); + FuncAttrs.addAttribute( + "disable-tail-calls", + llvm::toStringRef(DisableTailCalls)); FuncAttrs.addAttribute("less-precise-fpmad", llvm::toStringRef(CodeGenOpts.LessPreciseFPMAD)); Modified: cfe/trunk/test/CodeGen/attr-x86-interrupt.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/attr-x86-interrupt.c?rev=262830&r1=262829&r2=262830&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/attr-x86-interrupt.c (original) +++ cfe/trunk/test/CodeGen/attr-x86-interrupt.c Mon Mar 7 08:22:46 2016 @@ -15,12 +15,20 @@ __attribute__((interrupt)) void foo8(int // X86_64_LINUX: @llvm.used = appending global [2 x i8*] [i8* bitcast (void (i32*, i64)* @foo7 to i8*), i8* bitcast (void (i32*)* @foo8 to i8*)], section "llvm.metadata" // X86_64_LINUX: define x86_intrcc void @foo7(i32* %{{.+}}, i64 %{{.+}}) // X86_64_LINUX: define x86_intrcc void @foo8(i32* %{{.+}}) +// X86_64_LINUX: "disable-tail-calls"="true" +// X86_64_LINUX-NOT: "disable-tail-calls"="false" // X86_LINUX: @llvm.used = appending global [2 x i8*] [i8* bitcast (void (i32*, i32)* @foo7 to i8*), i8* bitcast (void (i32*)* @foo8 to i8*)], section "llvm.metadata" // X86_LINUX: define x86_intrcc void @foo7(i32* %{{.+}}, i32 %{{.+}}) // X86_LINUX: define x86_intrcc void @foo8(i32* %{{.+}}) +// X86_LINUX: "disable-tail-calls"="true" +// X86_LINUX-NOT: "disable-tail-calls"="false" // X86_64_WIN: @llvm.used = appending global [2 x i8*] [i8* bitcast (void (i32*, i64)* @foo7 to i8*), i8* bitcast (void (i32*)* @foo8 to i8*)], section "llvm.metadata" // X86_64_WIN: define x86_intrcc void @foo7(i32* %{{.+}}, i64 %{{.+}}) // X86_64_WIN: define x86_intrcc void @foo8(i32* %{{.+}}) +// X86_64_Win: "disable-tail-calls"="true" +// X86_64_Win-NOT: "disable-tail-calls"="false" // X86_WIN: @llvm.used = appending global [2 x i8*] [i8* bitcast (void (i32*, i32)* @foo7 to i8*), i8* bitcast (void (i32*)* @foo8 to i8*)], section "llvm.metadata" // X86_WIN: define x86_intrcc void @foo7(i32* %{{.+}}, i32 %{{.+}}) // X86_WIN: define x86_intrcc void @foo8(i32* %{{.+}}) +// X86_Win: "disable-tail-calls"="true" +// X86_Win-NOT: "disable-tail-calls"="false" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits