forked from OSchip/llvm-project
[OPENMP] Fox for http://llvm.org/PR23663: OpenMP crash
Destroy RuntimeCleanupScope before generation of termination instruction in parallel loop precondition. llvm-svn: 239524
This commit is contained in:
parent
e1e460dbc5
commit
6e8248fdad
|
@ -647,6 +647,7 @@ static void EmitPrivateLoopCounters(CodeGenFunction &CGF,
|
||||||
static void emitPreCond(CodeGenFunction &CGF, const OMPLoopDirective &S,
|
static void emitPreCond(CodeGenFunction &CGF, const OMPLoopDirective &S,
|
||||||
const Expr *Cond, llvm::BasicBlock *TrueBlock,
|
const Expr *Cond, llvm::BasicBlock *TrueBlock,
|
||||||
llvm::BasicBlock *FalseBlock, uint64_t TrueCount) {
|
llvm::BasicBlock *FalseBlock, uint64_t TrueCount) {
|
||||||
|
{
|
||||||
CodeGenFunction::OMPPrivateScope PreCondScope(CGF);
|
CodeGenFunction::OMPPrivateScope PreCondScope(CGF);
|
||||||
EmitPrivateLoopCounters(CGF, PreCondScope, S.counters());
|
EmitPrivateLoopCounters(CGF, PreCondScope, S.counters());
|
||||||
const VarDecl *IVDecl =
|
const VarDecl *IVDecl =
|
||||||
|
@ -672,6 +673,7 @@ static void emitPreCond(CodeGenFunction &CGF, const OMPLoopDirective &S,
|
||||||
for (auto I : S.updates()) {
|
for (auto I : S.updates()) {
|
||||||
CGF.EmitIgnoredExpr(I);
|
CGF.EmitIgnoredExpr(I);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Check that loop is executed at least one time.
|
// Check that loop is executed at least one time.
|
||||||
CGF.EmitBranchOnBoolExpr(Cond, TrueBlock, FalseBlock, TrueCount);
|
CGF.EmitBranchOnBoolExpr(Cond, TrueBlock, FalseBlock, TrueCount);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
|
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
|
||||||
// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
|
// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
|
||||||
// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
|
// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
|
||||||
|
// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -O1 -fopenmp -emit-llvm %s -o - | FileCheck %s --check-prefix=CLEANUP
|
||||||
//
|
//
|
||||||
// expected-no-diagnostics
|
// expected-no-diagnostics
|
||||||
#ifndef HEADER
|
#ifndef HEADER
|
||||||
|
@ -376,6 +377,7 @@ void runtime(float *a, float *b, float *c, float *d) {
|
||||||
int foo() {return 0;};
|
int foo() {return 0;};
|
||||||
|
|
||||||
// TERM_DEBUG-LABEL: parallel_for
|
// TERM_DEBUG-LABEL: parallel_for
|
||||||
|
// CLEANUP: parallel_for
|
||||||
void parallel_for(float *a) {
|
void parallel_for(float *a) {
|
||||||
#pragma omp parallel for schedule(static, 5)
|
#pragma omp parallel for schedule(static, 5)
|
||||||
// TERM_DEBUG-NOT: __kmpc_global_thread_num
|
// TERM_DEBUG-NOT: __kmpc_global_thread_num
|
||||||
|
@ -388,13 +390,17 @@ void parallel_for(float *a) {
|
||||||
// TERM_DEBUG: [[TERM_LPAD]]
|
// TERM_DEBUG: [[TERM_LPAD]]
|
||||||
// TERM_DEBUG: call void @__clang_call_terminate
|
// TERM_DEBUG: call void @__clang_call_terminate
|
||||||
// TERM_DEBUG: unreachable
|
// TERM_DEBUG: unreachable
|
||||||
|
// CLEANUP-NOT: __kmpc_global_thread_num
|
||||||
|
// CLEANUP: call void @__kmpc_for_static_init_4u({{.+}})
|
||||||
|
// CLEANUP: call void @__kmpc_for_static_fini({{.+}})
|
||||||
|
// CLEANUP: call {{.+}} @__kmpc_cancel_barrier({{.+}})
|
||||||
for (unsigned i = 131071; i <= 2147483647; i += 127)
|
for (unsigned i = 131071; i <= 2147483647; i += 127)
|
||||||
a[i] += foo();
|
a[i] += foo();
|
||||||
}
|
}
|
||||||
// Check source line corresponds to "#pragma omp parallel for schedule(static, 5)" above:
|
// Check source line corresponds to "#pragma omp parallel for schedule(static, 5)" above:
|
||||||
// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-4]],
|
// TERM_DEBUG-DAG: [[DBG_LOC_START]] = !DILocation(line: [[@LINE-4]],
|
||||||
// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-16]],
|
// TERM_DEBUG-DAG: [[DBG_LOC_END]] = !DILocation(line: [[@LINE-20]],
|
||||||
// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !DILocation(line: [[@LINE-17]],
|
// TERM_DEBUG-DAG: [[DBG_LOC_CANCEL]] = !DILocation(line: [[@LINE-21]],
|
||||||
|
|
||||||
#endif // HEADER
|
#endif // HEADER
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue