r236482 - [OPENMP] Fixed incorrect work with cleanups, NFC.
Alexey Bataev
a.bataev at hotmail.com
Mon May 4 23:21:01 PDT 2015
Author: abataev
Date: Tue May 5 01:21:01 2015
New Revision: 236482
URL: http://llvm.org/viewvc/llvm-project?rev=236482&view=rev
Log:
[OPENMP] Fixed incorrect work with cleanups, NFC.
Destructors are never called for cleanups, so we can't use SmallVector as a member.
Differential Revision: http://reviews.llvm.org/D9399
Modified:
cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp
Modified: cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp?rev=236482&r1=236481&r2=236482&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGOpenMPRuntime.cpp Tue May 5 01:21:01 2015
@@ -1154,16 +1154,16 @@ llvm::Value *CGOpenMPRuntime::getCritica
}
namespace {
-class CallEndCleanup : public EHScopeStack::Cleanup {
-public:
- typedef ArrayRef<llvm::Value *> CleanupValuesTy;
-private:
+template <int N> class CallEndCleanup : public EHScopeStack::Cleanup {
llvm::Value *Callee;
- llvm::SmallVector<llvm::Value *, 8> Args;
+ llvm::Value *Args[N];
public:
- CallEndCleanup(llvm::Value *Callee, CleanupValuesTy Args)
- : Callee(Callee), Args(Args.begin(), Args.end()) {}
+ CallEndCleanup(llvm::Value *Callee, ArrayRef<llvm::Value *> CleanupArgs)
+ : Callee(Callee) {
+ assert(CleanupArgs.size() == N);
+ std::copy(CleanupArgs.begin(), CleanupArgs.end(), std::begin(Args));
+ }
void Emit(CodeGenFunction &CGF, Flags /*flags*/) override {
CGF.EmitRuntimeCall(Callee, Args);
}
@@ -1184,7 +1184,8 @@ void CGOpenMPRuntime::emitCriticalRegion
getCriticalRegionLock(CriticalName)};
CGF.EmitRuntimeCall(createRuntimeFunction(OMPRTL__kmpc_critical), Args);
// Build a call to __kmpc_end_critical
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(Args);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup, createRuntimeFunction(OMPRTL__kmpc_end_critical),
llvm::makeArrayRef(Args));
emitInlinedDirective(CGF, CriticalOpGen);
@@ -1222,7 +1223,8 @@ void CGOpenMPRuntime::emitMasterRegion(C
CGF.EmitRuntimeCall(createRuntimeFunction(OMPRTL__kmpc_master), Args);
emitIfStmt(CGF, IsMaster, [&](CodeGenFunction &CGF) -> void {
CodeGenFunction::RunCleanupsScope Scope(CGF);
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(Args);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup, createRuntimeFunction(OMPRTL__kmpc_end_master),
llvm::makeArrayRef(Args));
MasterOpGen(CGF);
@@ -1328,7 +1330,8 @@ void CGOpenMPRuntime::emitSingleRegion(C
CGF.EmitRuntimeCall(createRuntimeFunction(OMPRTL__kmpc_single), Args);
emitIfStmt(CGF, IsSingle, [&](CodeGenFunction &CGF) -> void {
CodeGenFunction::RunCleanupsScope Scope(CGF);
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(Args);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup, createRuntimeFunction(OMPRTL__kmpc_end_single),
llvm::makeArrayRef(Args));
SingleOpGen(CGF);
@@ -1391,7 +1394,8 @@ void CGOpenMPRuntime::emitOrderedRegion(
llvm::Value *Args[] = {emitUpdateLocation(CGF, Loc), getThreadID(CGF, Loc)};
CGF.EmitRuntimeCall(createRuntimeFunction(OMPRTL__kmpc_ordered), Args);
// Build a call to __kmpc_end_ordered
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(Args);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup, createRuntimeFunction(OMPRTL__kmpc_end_ordered),
llvm::makeArrayRef(Args));
emitInlinedDirective(CGF, OrderedOpGen);
@@ -1999,7 +2003,8 @@ void CGOpenMPRuntime::emitTaskCall(
createRuntimeFunction(OMPRTL__kmpc_omp_task_begin_if0), TaskArgs);
// Build void __kmpc_omp_task_complete_if0(ident_t *, kmp_int32 gtid,
// kmp_task_t *new_task);
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(TaskArgs);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup,
createRuntimeFunction(OMPRTL__kmpc_omp_task_complete_if0),
llvm::makeArrayRef(TaskArgs));
@@ -2191,7 +2196,8 @@ void CGOpenMPRuntime::emitReduction(Code
ThreadId, // i32 <gtid>
Lock // kmp_critical_name *&<lock>
};
- CGF.EHStack.pushCleanup<CallEndCleanup>(
+ constexpr auto Size = array_lengthof(EndArgs);
+ CGF.EHStack.pushCleanup<CallEndCleanup<Size>>(
NormalAndEHCleanup,
createRuntimeFunction(WithNowait ? OMPRTL__kmpc_end_reduce_nowait
: OMPRTL__kmpc_end_reduce),
More information about the cfe-commits
mailing list