1 files changed, 42 insertions, 15 deletions

diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp
index 8d7d08fca28..1b3e786b30b 100644
--- a/clang/lib/CodeGen/CGStmtOpenMP.cpp
+++ b/clang/lib/CodeGen/CGStmtOpenMP.cpp
@@ -94,7 +94,7 @@ void CodeGenFunction::EmitOMPAggregateAssign(LValue OriginalAddr,
 
 void CodeGenFunction::EmitOMPFirstprivateClause(
     const OMPExecutableDirective &D,
-    CodeGenFunction::OuterDeclMapTy &OuterDeclMap) {
+    CodeGenFunction::OMPPrivateScope &PrivateScope) {
   auto PrivateFilter = [](const OMPClause *C) -> bool {
     return C->getClauseKind() == OMPC_firstprivate;
   };
@@ -104,25 +104,34 @@ void CodeGenFunction::EmitOMPFirstprivateClause(
     auto IRef = C->varlist_begin();
     auto InitsRef = C->inits().begin();
     for (auto IInit : C->private_copies()) {
-      auto VD = cast<VarDecl>(cast<DeclRefExpr>(IInit)->getDecl());
+      auto *OrigVD = cast<VarDecl>(cast<DeclRefExpr>(*IRef)->getDecl());
+      auto *VD = cast<VarDecl>(cast<DeclRefExpr>(IInit)->getDecl());
+      bool IsRegistered;
       if (*InitsRef != nullptr) {
         // Emit VarDecl with copy init for arrays.
-        auto *FD = CapturedStmtInfo->lookup(
-            cast<VarDecl>(cast<DeclRefExpr>(*IRef)->getDecl()));
+        auto *FD = CapturedStmtInfo->lookup(OrigVD);
         LValue Base = MakeNaturalAlignAddrLValue(
             CapturedStmtInfo->getContextValue(),
             getContext().getTagDeclType(FD->getParent()));
         auto OriginalAddr = EmitLValueForField(Base, FD);
         auto VDInit = cast<VarDecl>(cast<DeclRefExpr>(*InitsRef)->getDecl());
-        auto Emission = EmitAutoVarAlloca(*VD);
-        // Emit initialization of aggregate firstprivate vars.
-        EmitOMPAggregateAssign(OriginalAddr, Emission.getAllocatedAddress(),
-                               VD->getInit(), (*IRef)->getType(), VDInit);
-        EmitAutoVarCleanups(Emission);
+        IsRegistered = PrivateScope.addPrivate(OrigVD, [&]() -> llvm::Value * {
+          auto Emission = EmitAutoVarAlloca(*VD);
+          // Emit initialization of aggregate firstprivate vars.
+          EmitOMPAggregateAssign(OriginalAddr, Emission.getAllocatedAddress(),
+                                 VD->getInit(), (*IRef)->getType(), VDInit);
+          EmitAutoVarCleanups(Emission);
+          return Emission.getAllocatedAddress();
+        });
       } else
-        // Emit VarDecl with copy init.
-        EmitDecl(*VD);
-      OuterDeclMap[cast<DeclRefExpr>(*IRef)->getDecl()] = GetAddrOfLocalVar(VD);
+        IsRegistered = PrivateScope.addPrivate(OrigVD, [&]() -> llvm::Value * {
+          // Emit private VarDecl with copy init.
+          EmitDecl(*VD);
+          return GetAddrOfLocalVar(VD);
+        });
+      assert(IsRegistered && "counter already registered as private");
+      // Silence the warning about unused variable.
+      (void)IsRegistered;
       ++IRef, ++InitsRef;
     }
   }
@@ -239,7 +248,7 @@ static void EmitOMPAlignedClause(CodeGenFunction &CGF, CodeGenModule &CGM,
     unsigned Alignment = ClauseAlignment;
     if (Alignment == 0) {
       // OpenMP [2.8.1, Description]
-      // If no optional parameter isspecified, implementation-defined default
+      // If no optional parameter is specified, implementation-defined default
       // alignments for SIMD instructions on the target platforms are assumed.
       Alignment = CGM.getTargetCodeGenInfo().getOpenMPSimdDefaultAlignment(
           E->getType());
@@ -253,6 +262,24 @@ static void EmitOMPAlignedClause(CodeGenFunction &CGF, CodeGenModule &CGM,
   }
 }
 
+static void EmitPrivateLoopCounters(CodeGenFunction &CGF,
+                                    CodeGenFunction::OMPPrivateScope &LoopScope,
+                                    ArrayRef<Expr *> Counters) {
+  for (auto *E : Counters) {
+    auto VD = cast<VarDecl>(cast<DeclRefExpr>(E)->getDecl());
+    bool IsRegistered = LoopScope.addPrivate(VD, [&]() -> llvm::Value * {
+      // Emit var without initialization.
+      auto VarEmission = CGF.EmitAutoVarAlloca(*VD);
+      CGF.EmitAutoVarCleanups(VarEmission);
+      return VarEmission.getAllocatedAddress();
+    });
+    assert(IsRegistered && "counter already registered as private");
+    // Silence the warning about unused variable.
+    (void)IsRegistered;
+  }
+  (void)LoopScope.Privatize();
+}
+
 void CodeGenFunction::EmitOMPSimdDirective(const OMPSimdDirective &S) {
   // Pragma 'simd' code depends on presence of 'lastprivate'.
   // If present, we have to separate last iteration of the loop:
@@ -330,7 +357,7 @@ void CodeGenFunction::EmitOMPSimdDirective(const OMPSimdDirective &S) {
     // Emit 'then' code.
     {
       OMPPrivateScope LoopScope(*this);
-      LoopScope.addPrivates(S.counters());
+      EmitPrivateLoopCounters(*this, LoopScope, S.counters());
       EmitOMPInnerLoop(S, LoopScope, /* SeparateIter */ true);
       EmitOMPLoopBody(S, /* SeparateIter */ true);
     }
@@ -341,7 +368,7 @@ void CodeGenFunction::EmitOMPSimdDirective(const OMPSimdDirective &S) {
   } else {
     {
       OMPPrivateScope LoopScope(*this);
-      LoopScope.addPrivates(S.counters());
+      EmitPrivateLoopCounters(*this, LoopScope, S.counters());
       EmitOMPInnerLoop(S, LoopScope);
     }
     EmitOMPSimdFinal(S);