From d076333a538c5ad9744999c3727038493c3a71ac Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sat, 28 Oct 2023 10:29:29 +0300
Subject: [PATCH] fixed merge

---
 .../_src/DirectiveProcessing/directive_parser.cpp           | 2 +-
 .../Sapfor_2017/_src/Transformations/private_removing.cpp   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp
index 7fb2bc7..c93fd31 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp
@@ -647,7 +647,7 @@ vector<OmpDir> parseOmpDirs(void* stIn, const set<string> &globalPriv, bool forD
     char* lineS = st->comments();
     if (!lineS)
         return resultAll;
-        
+
     vector<string> split;
     splitString(lineS, '\n', split);
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
index c5ab83f..daea61c 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
@@ -937,7 +937,7 @@ static vector<vector<FixedSubscript>> checkImplicitDirectUsage(Context* ctx)
             if (funcInfo->funcParams.isArgOut(i) || // implicit direct usage
                 callArg->lhs() == nullptr) // reference to whole array
             {
-                auto& mask = getFixedSubscriptsVector((SgArrayRefExp*)callArg, ctx->dimensionsNum);
+                auto mask = getFixedSubscriptsVector((SgArrayRefExp*)callArg, ctx->dimensionsNum);
                 fixedSubscripts.push_back(mask);
                 addMessageUsageInFunctionCall(ctx->messages, getDimensionVarName(ctx->arraySymbol, mask),
                                                 procName, ctx->loop->lineNum, st->lineNumber());
@@ -994,7 +994,7 @@ static void checkIndirectUsage(Context* ctx, FuncInfo* curFunc, vector<Variable*
             vector<SgArrayRefExp*> directArrayRefs = getDirectArrayRefs(varUse.getFunction(), varUse.getUseS());
             for (auto arrayRef : directArrayRefs)
             {
-                auto& mask = getFixedSubscriptsVector(arrayRef, ctx->dimensionsNum);
+                auto mask = getFixedSubscriptsVector(arrayRef, ctx->dimensionsNum);
                 indirectUsageMasks.push_back(mask);
                 addMessageUsageInFunctionCall(ctx->messages, getDimensionVarName(ctx->arraySymbol, mask),
                                               curFunc->funcName, ctx->loop->lineNum, ctx->loop->lineNum);
@@ -1674,7 +1674,7 @@ void removePrivatesAnalysis(vector<LoopGraph*>& loopGraphs,
             context.dimensionsNum = getDimension(arrayToRemove);
             context.arraySymbol = arrayToRemove;
 
-            auto& filterMasks = checkImplicitAndIndirectUsage(&context);
+            auto filterMasks = checkImplicitAndIndirectUsage(&context);
             filterArrayRefs(&context, arrayRefs, filterMasks);
             context.explicitArrayRefs.swap(arrayRefs);