switch VTableDeclMap.contains

Author: Jason-VanBeusekom

clang/lib/CodeGen/CGOpenMPRuntime.cpp

@@ -1835,8 +1835,7 @@ void CGOpenMPRuntime::emitAndRegisterVTable(CodeGenModule &CGM,
   // Register C++ VTable to OpenMP Offload Entry if it's a new
   // CXXRecordDecl.
   if (CXXRecord && CXXRecord->isDynamicClass() &&
-      CGM.getOpenMPRuntime().VTableDeclMap.find(CXXRecord) ==
-          CGM.getOpenMPRuntime().VTableDeclMap.end()) {
+      !CGM.getOpenMPRuntime().VTableDeclMap.contains(CXXRecord)) {
     CGM.getOpenMPRuntime().VTableDeclMap.try_emplace(CXXRecord, VD);
     CGM.EmitVTable(CXXRecord);
     CodeGenVTables VTables = CGM.getVTables();
@@ -1872,10 +1871,16 @@ void CGOpenMPRuntime::registerVTable(const OMPExecutableDirective &D) {
     const VarDecl *VD = nullptr;
     if (auto *DRE = dyn_cast<DeclRefExpr>(E))
       VD = cast<VarDecl>(DRE->getDecl());
-    else if (auto *MRE = dyn_cast<MemberExpr>(E))
-      if (auto *BaseDRE = dyn_cast<DeclRefExpr>(MRE->getBase()))
-        if (auto *BaseVD = dyn_cast<VarDecl>(BaseDRE->getDecl()))
+    else if (auto *MRE = dyn_cast<MemberExpr>(E)){
+      printf("here\n");
+      if (auto *BaseDRE = dyn_cast<DeclRefExpr>(MRE->getBase())){
+        printf("here 1\n");
+        if (auto *BaseVD = dyn_cast<VarDecl>(BaseDRE->getDecl())){
           VD = BaseVD;
+          printf("here 2\n");
+        }
+      }
+      }
     return std::pair<CXXRecordDecl *, const VarDecl *>(CXXRecord, VD);
   };
   // Collect VTable from OpenMP map clause.