Do suggested changes by andy

Author: erichkeane

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -529,18 +529,32 @@ class CIRGenFunction : public CIRGenTypeCache {
     symbolTable.insert(vd, addr.getPointer());
   }
 
-  // A class to allow inserting things into the declaration map during some sort
-  // of alternative generation (used currently for the OpenACC recipe
-  // generation), then reverting changes after the fact.
+  // A class to allow reverting changes to a var-decl's registration to the
+  // localDeclMap. This is used in cases where things are being inserted into
+  // the variable list but don't follow normal lookup/search rules, like in
+  // OpenACC recipe generation.
   class DeclMapRevertingRAII {
     CIRGenFunction &cgf;
-    CIRGenFunction::DeclMapTy originalMap;
+    const VarDecl *vd;
+    bool shouldDelete = false;
+    Address oldAddr = Address::invalid();
 
   public:
-    DeclMapRevertingRAII(CIRGenFunction &cgf)
-        : cgf(cgf), originalMap(cgf.localDeclMap) {}
+    DeclMapRevertingRAII(CIRGenFunction &cgf, const VarDecl *vd) : cgf(cgf), vd(vd) {
+      auto mapItr = cgf.localDeclMap.find(vd);
 
-    ~DeclMapRevertingRAII() { cgf.localDeclMap = std::move(originalMap); }
+      if (mapItr != cgf.localDeclMap.end())
+        oldAddr = mapItr->second;
+      else
+        shouldDelete = true;
+    }
+
+    ~DeclMapRevertingRAII() {
+      if (shouldDelete)
+        cgf.localDeclMap.erase(vd);
+      else
+        cgf.localDeclMap.insert_or_assign(vd, oldAddr);
+    }
   };
 
   bool shouldNullCheckClassCastValue(const CastExpr *ce);

clang/lib/CIR/CodeGen/CIRGenOpenACCClause.cpp

@@ -409,6 +409,7 @@ class OpenACCClauseCIREmitter final
         Address{toArg, elementTy, cgf.getContext().getDeclAlign(varRecipe)});
     tempDeclEmission.EmittedAsOffload = true;
 
+    CIRGenFunction::DeclMapRevertingRAII declMapRAII{cgf,temporary};
     cgf.setAddrOfLocalVar(
         temporary,
         Address{fromArg, elementTy, cgf.getContext().getDeclAlign(varRecipe)});
@@ -433,7 +434,7 @@ class OpenACCClauseCIREmitter final
 
     CIRGenFunction::AutoVarEmission tempDeclEmission{
         CIRGenFunction::AutoVarEmission::invalid()};
-    CIRGenFunction::DeclMapRevertingRAII declMapRAII{cgf};
+    CIRGenFunction::DeclMapRevertingRAII declMapRAII{cgf, varRecipe};
 
     // Do the 'init' section of the recipe IR, which does an alloca, then the
     // initialization (except for firstprivate).