@@ -1756,8 +1756,8 @@ class TaskContextStructManager {
17561756 // / De-allocate the task context structure.
17571757 void freeStructPtr ();
17581758
1759- MutableArrayRef<llvm::Value *> getLLVMPrivateVars () {
1760- return llvmPrivateVars ;
1759+ MutableArrayRef<llvm::Value *> getLLVMPrivateVarGEPs () {
1760+ return llvmPrivateVarGEPs ;
17611761 }
17621762
17631763 llvm::Value *getStructPtr () { return structPtr; }
@@ -1772,7 +1772,7 @@ class TaskContextStructManager {
17721772
17731773 // / LLVM values for each private variable, or null if that private variable is
17741774 // / not included in the task context structure
1775- SmallVector<llvm::Value *> llvmPrivateVars ;
1775+ SmallVector<llvm::Value *> llvmPrivateVarGEPs ;
17761776
17771777 // / A pointer to the structure containing context for this task.
17781778 llvm::Value *structPtr = nullptr ;
@@ -1816,19 +1816,19 @@ void TaskContextStructManager::createGEPsToPrivateVars() {
18161816 }
18171817
18181818 // Create GEPs for each struct member
1819- llvmPrivateVars .clear ();
1820- llvmPrivateVars .reserve (privateDecls.size ());
1819+ llvmPrivateVarGEPs .clear ();
1820+ llvmPrivateVarGEPs .reserve (privateDecls.size ());
18211821 llvm::Value *zero = builder.getInt32 (0 );
18221822 unsigned i = 0 ;
18231823 for (auto privDecl : privateDecls) {
18241824 if (!privDecl.readsFromMold ()) {
18251825 // Handle this inside of the task so we don't pass unnessecary vars in
1826- llvmPrivateVars .push_back (nullptr );
1826+ llvmPrivateVarGEPs .push_back (nullptr );
18271827 continue ;
18281828 }
18291829 llvm::Value *iVal = builder.getInt32 (i);
18301830 llvm::Value *gep = builder.CreateGEP (structTy, structPtr, {zero, iVal});
1831- llvmPrivateVars .push_back (gep);
1831+ llvmPrivateVarGEPs .push_back (gep);
18321832 i += 1 ;
18331833 }
18341834}
@@ -1923,7 +1923,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
19231923
19241924 for (auto [privDecl, mlirPrivVar, blockArg, llvmPrivateVarAlloc] :
19251925 llvm::zip_equal (privateDecls, mlirPrivateVars, privateBlockArgs,
1926- taskStructMgr.getLLVMPrivateVars ())) {
1926+ taskStructMgr.getLLVMPrivateVarGEPs ())) {
19271927 if (!privDecl.readsFromMold ())
19281928 // to be handled inside the task
19291929 continue ;
@@ -1961,7 +1961,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
19611961
19621962 // firstprivate copy region
19631963 if (failed (initFirstPrivateVars (builder, moduleTranslation, mlirPrivateVars,
1964- taskStructMgr.getLLVMPrivateVars (),
1964+ taskStructMgr.getLLVMPrivateVarGEPs (),
19651965 privateDecls, copyBlock)))
19661966 return llvm::failure ();
19671967
@@ -2004,7 +2004,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
20042004 // Find and map the addresses of each variable within the task context
20052005 // structure
20062006 taskStructMgr.createGEPsToPrivateVars ();
2007- llvm::copy (taskStructMgr.getLLVMPrivateVars (),
2007+ llvm::copy (taskStructMgr.getLLVMPrivateVarGEPs (),
20082008 std::back_inserter (llvmPrivateVars));
20092009 for (auto [blockArg, llvmPrivateVar] :
20102010 llvm::zip_equal (privateBlockArgs, llvmPrivateVars)) {
0 commit comments