format fix

Author: Jason-VanBeusekom

clang/lib/CodeGen/CGOpenMPRuntime.cpp

@@ -1830,36 +1830,31 @@ void CGOpenMPRuntime::registerVTableOffloadEntry(llvm::GlobalVariable *VTable,
 }
 
 void CGOpenMPRuntime::emitAndRegisterVTable(CodeGenModule &CGM,
-                                           CXXRecordDecl *CXXRecord,
-                                           const VarDecl *VD) {
-        // 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.try_emplace(CXXRecord, VD);
-          CGM.EmitVTable(CXXRecord);
-          CodeGenVTables VTables = CGM.getVTables();
-          llvm::GlobalVariable *VTablesAddr = VTables.GetAddrOfVTable(CXXRecord);
-          if (VTablesAddr)
-            CGM.getOpenMPRuntime().registerVTableOffloadEntry(VTablesAddr, VD);
-          // Emit VTable for all the fields containing dynamic CXXRecord
-          for (const FieldDecl *Field : CXXRecord->fields()) {
-            if (CXXRecordDecl *RecordDecl =
-                    Field->getType()->getAsCXXRecordDecl())
-              emitAndRegisterVTable(CGM, RecordDecl, VD);
-
-          }
-          // Emit VTable for all dynamic parent class
-          for (CXXBaseSpecifier &Base : CXXRecord->bases()) {
-            if (CXXRecordDecl *BaseDecl =
-                    Base.getType()->getAsCXXRecordDecl())
-              emitAndRegisterVTable(CGM, BaseDecl, VD);
-
-          }
-        }
-      };
-
+                                            CXXRecordDecl *CXXRecord,
+                                            const VarDecl *VD) {
+  // 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.try_emplace(CXXRecord, VD);
+    CGM.EmitVTable(CXXRecord);
+    CodeGenVTables VTables = CGM.getVTables();
+    llvm::GlobalVariable *VTablesAddr = VTables.GetAddrOfVTable(CXXRecord);
+    if (VTablesAddr)
+      CGM.getOpenMPRuntime().registerVTableOffloadEntry(VTablesAddr, VD);
+    // Emit VTable for all the fields containing dynamic CXXRecord
+    for (const FieldDecl *Field : CXXRecord->fields()) {
+      if (CXXRecordDecl *RecordDecl = Field->getType()->getAsCXXRecordDecl())
+        emitAndRegisterVTable(CGM, RecordDecl, VD);
+    }
+    // Emit VTable for all dynamic parent class
+    for (CXXBaseSpecifier &Base : CXXRecord->bases()) {
+      if (CXXRecordDecl *BaseDecl = Base.getType()->getAsCXXRecordDecl())
+        emitAndRegisterVTable(CGM, BaseDecl, VD);
+    }
+  }
+};
 
 void CGOpenMPRuntime::registerVTable(const OMPExecutableDirective &D) {
   // Register VTable by scanning through the map clause of OpenMP target region.
@@ -10070,15 +10065,15 @@ void CGOpenMPRuntime::scanForTargetRegionsFunctions(const Stmt *S,
   // Register vtable from device for target data and target directives.
   // Add this block here since scanForTargetRegionsFunctions ignores
   // target data by checking if S is a executable directive (target).
-    if (isa<OMPExecutableDirective>(S) &&
-        isOpenMPTargetDataManagementDirective(
-            dyn_cast<OMPExecutableDirective>(S)->getDirectiveKind())) {
-      auto &E = *dyn_cast<OMPExecutableDirective>(S);
-      // Don't need to check if it's device compile
-      // since scanForTargetRegionsFunctions currently only called
-      // in device compilation.
-      registerVTable(E);
-    }
+  if (isa<OMPExecutableDirective>(S) &&
+      isOpenMPTargetDataManagementDirective(
+          dyn_cast<OMPExecutableDirective>(S)->getDirectiveKind())) {
+    auto &E = *dyn_cast<OMPExecutableDirective>(S);
+    // Don't need to check if it's device compile
+    // since scanForTargetRegionsFunctions currently only called
+    // in device compilation.
+    registerVTable(E);
+  }
 
   // Codegen OMP target directives that offload compute to the device.
   bool RequiresDeviceCodegen =

clang/lib/CodeGen/CodeGenModule.h

@@ -754,7 +754,7 @@ class CodeGenModule : public CodeGenTypeCache {
   // i32 @__isPlatformVersionAtLeast(i32, i32, i32, i32)
   llvm::FunctionCallee IsPlatformVersionAtLeastFn = nullptr;
 
-  //  Store indirect CallExprs that are within an omp target region 
+  //  Store indirect CallExprs that are within an omp target region
   llvm::SmallPtrSet<const CallExpr *, 16> OMPTargetCalls;
 
   InstrProfStats &getPGOStats() { return PGOStats; }

clang/test/OpenMP/target_vtable_codegen_implicit_namespace.cpp

@@ -40,4 +40,4 @@ int main() {
      }
   }
   return 0;
-}
+}

clang/test/OpenMP/target_vtable_codegen_mult_inherritence.cpp

@@ -43,4 +43,4 @@ int main() {
       }
     }
   return 0;
-}
+}

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -10249,8 +10249,8 @@ void OpenMPIRBuilder::createOffloadEntriesAndInfoMetadata(
       case OffloadEntriesInfoManager::OMPTargetGlobalVarEntryIndirect:
       case OffloadEntriesInfoManager::OMPTargetGlobalVarEntryIndirectVTable:
         if (!CE->getAddress()) {
-            ErrorFn(EMIT_MD_GLOBAL_VAR_INDIRECT_ERROR, E.second);
-            continue;
+          ErrorFn(EMIT_MD_GLOBAL_VAR_INDIRECT_ERROR, E.second);
+          continue;
         }
         break;
       default:
@@ -10702,7 +10702,8 @@ void OffloadEntriesInfoManager::registerDeviceGlobalVarEntryInfo(
       return;
     }
     if (Flags == OffloadEntriesInfoManager::OMPTargetGlobalVarEntryIndirect ||
-        Flags == OffloadEntriesInfoManager::OMPTargetGlobalVarEntryIndirectVTable)
+        Flags ==
+            OffloadEntriesInfoManager::OMPTargetGlobalVarEntryIndirectVTable)
       OffloadEntriesDeviceGlobalVar.try_emplace(VarName, OffloadingEntriesNum,
                                                 Addr, VarSize, Flags, Linkage,
                                                 VarName.str());

offload/include/omptarget.h

@@ -94,7 +94,7 @@ enum OpenMPOffloadingDeclareTargetFlags {
   OMP_DECLARE_TARGET_INDIRECT = 0x08,
   /// This is an entry corresponding to a requirement to be registered.
   OMP_REGISTER_REQUIRES = 0x10,
-    /// Mark the entry global as being an indirect vtable.
+  /// Mark the entry global as being an indirect vtable.
   OMP_DECLARE_TARGET_INDIRECT_VTABLE = 0x20,
 };
 

offload/test/api/omp_indirect_call_table_manual.c

@@ -89,7 +89,7 @@ int main() {
   myClass obj_baz = {dispatchTable + 2};
   int aaa = 0;
 
-#pragma omp target map(aaa) map (to: obj_foo, obj_bar, obj_baz)
+#pragma omp target map(aaa) map(to : obj_foo, obj_bar, obj_baz)
   {
     // Lookup
     fptr_t *foo_ptr = __llvm_omp_indirect_call_lookup(obj_foo.dispatchPtr);