@@ -1960,17 +1960,17 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
19601960 for (auto [privDecl, mlirPrivVar, blockArg, llvmPrivateVarAlloc] :
19611961 llvm::zip_equal (privateDecls, mlirPrivateVars, privateBlockArgs,
19621962 taskStructMgr.getLLVMPrivateVarGEPs ())) {
1963+ // To be handled inside the task.
19631964 if (!privDecl.readsFromMold ())
1964- // to be handled inside the task
19651965 continue ;
19661966 assert (llvmPrivateVarAlloc &&
19671967 " reads from mold so shouldn't have been skipped" );
19681968
19691969 llvm::Expected<llvm::Value *> privateVarOrErr =
19701970 initPrivateVar (builder, moduleTranslation, privDecl, mlirPrivVar,
19711971 blockArg, llvmPrivateVarAlloc, initBlock);
1972- if (auto err = privateVarOrErr. takeError () )
1973- return handleError (std::move (err) , *taskOp.getOperation ());
1972+ if (! privateVarOrErr)
1973+ return handleError (privateVarOrErr , *taskOp.getOperation ());
19741974
19751975 llvm::IRBuilderBase::InsertPointGuard guard (builder);
19761976 builder.SetInsertPoint (builder.GetInsertBlock ()->getTerminator ());
@@ -2034,8 +2034,8 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
20342034 llvm::Expected<llvm::Value *> privateVarOrError =
20352035 initPrivateVar (builder, moduleTranslation, privDecl, mlirPrivVar,
20362036 blockArg, llvmPrivateVar, privInitBlock);
2037- if (auto err = privateVarOrError. takeError () )
2038- return err ;
2037+ if (! privateVarOrError)
2038+ return privateVarOrError. takeError () ;
20392039 moduleTranslation.mapValue (blockArg, privateVarOrError.get ());
20402040 llvmPrivateVars[i] = privateVarOrError.get ();
20412041 }
0 commit comments