Skip to content

Commit 3e704c3

Browse files
committed
Fix var args
1 parent 852ca95 commit 3e704c3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

llvm/include/llvm/Frontend/OpenMP/OMPKinds.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,9 +1432,9 @@ __OMP_ASSUME_CLAUSE(llvm::StringLiteral("no_parallelism"), false, false, false)
14321432
OMP_CALLBACK(OMPRTL_##Name, VarArgsArePassed, CallbackArgNo, __VA_ARGS__)
14331433

14341434
__OMP_CALLBACK(__kmpc_fork_call, true, 2, -1, -1)
1435-
__OMP_CALLBACK(__kmpc_fork_call_if, true, 2, -1, -1)
1435+
__OMP_CALLBACK(__kmpc_fork_call_if, false, 2, -1, -1)
14361436
__OMP_CALLBACK(__kmpc_fork_teams, true, 2, -1, -1)
1437-
__OMP_CALLBACK(__kmpc_omp_task_alloc, true, 5, -1, -1)
1437+
__OMP_CALLBACK(__kmpc_omp_task_alloc, false, 5, -1, -1)
14381438

14391439
#undef __OMP_PTR_TYPE
14401440

llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7716,9 +7716,11 @@ TEST_F(OpenMPIRBuilderTest, createCallbackMetadata) {
77167716
*M, llvm::omp::RuntimeFunction::OMPRTL___kmpc_omp_task_alloc);
77177717

77187718
M->dump();
7719-
for (auto [FC, ArgNo] : zip(SmallVector<FunctionCallee>(
7720-
{ForkCall, ForkCallIf, ForkTeam, TaskAlloc}),
7721-
SmallVector<unsigned>({2, 2, 2, 5}))) {
7719+
for (auto [FC, VarArg, ArgNo] :
7720+
zip(SmallVector<FunctionCallee>(
7721+
{ForkCall, ForkCallIf, ForkTeam, TaskAlloc}),
7722+
SmallVector<bool>({true, false, true, false}),
7723+
SmallVector<unsigned>({2, 2, 2, 5}))) {
77227724
MDNode *CallbackMD =
77237725
cast<Function>(FC.getCallee())->getMetadata(LLVMContext::MD_callback);
77247726
EXPECT_NE(CallbackMD, nullptr);
@@ -7741,13 +7743,13 @@ TEST_F(OpenMPIRBuilderTest, createCallbackMetadata) {
77417743
cast<ConstantInt>(
77427744
cast<ConstantAsMetadata>(OpMD->getOperand(2))->getValue())
77437745
->getZExtValue();
7744-
uint64_t VarArg =
7746+
uint64_t _VarArg =
77457747
cast<ConstantInt>(
77467748
cast<ConstantAsMetadata>(OpMD->getOperand(3))->getValue())
77477749
->getZExtValue();
77487750
EXPECT_EQ(Arg0, -1);
77497751
EXPECT_EQ(Arg1, -1);
7750-
EXPECT_EQ(VarArg, true);
7752+
EXPECT_EQ(_VarArg, VarArg);
77517753
}
77527754
EXPECT_EQ(Num, 1);
77537755
}

0 commit comments

Comments
 (0)