Merge branch 'users/meinersbur/flang_runtime_FortranSupport' into users/meinersbur/flang_runtime_Testing

Author: Meinersbur

flang/include/flang/Runtime/allocatable.h

@@ -11,13 +11,10 @@
 #ifndef FORTRAN_RUNTIME_ALLOCATABLE_H_
 #define FORTRAN_RUNTIME_ALLOCATABLE_H_
 
-#include "flang/Common/Fortran-consts.h"
-#include "flang/Runtime/descriptor-consts.h"
+#include "flang/Runtime/descriptor.h"
 #include "flang/Runtime/entry-names.h"
 
 namespace Fortran::runtime {
-using SubscriptValue = ISO::CFI_index_t;
-using common::TypeCategory;
 
 extern "C" {
 

flang/include/flang/Runtime/io-api.h

@@ -1,4 +1,4 @@
-//===-- include/flang-rt/io-api.h -------------------------------*- C++ -*-===//
+//===-- include/flang/Runtime/io-api.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/Runtime/pointer.h

@@ -12,14 +12,10 @@
 #ifndef FORTRAN_RUNTIME_POINTER_H_
 #define FORTRAN_RUNTIME_POINTER_H_
 
-#include "flang/Common/Fortran-consts.h"
-#include "flang/Runtime/descriptor-consts.h"
+#include "flang/Runtime/descriptor.h"
 #include "flang/Runtime/entry-names.h"
 
 namespace Fortran::runtime {
-using SubscriptValue = ISO::CFI_index_t;
-using common::TypeCategory;
-
 extern "C" {
 
 // Data pointer initialization for NULLIFY(), "p=>NULL()`, & for ALLOCATE().
@@ -126,4 +122,4 @@ RT_API_ATTRS bool ValidatePointerPayload(const ISO::CFI_cdesc_t &);
 
 } // extern "C"
 } // namespace Fortran::runtime
-#endif /* FORTRAN_RUNTIME_POINTER_H_ */
+#endif // FORTRAN_RUNTIME_POINTER_H_

flang/include/flang/Semantics/semantics.h

@@ -17,7 +17,6 @@
 #include "flang/Evaluate/intrinsics.h"
 #include "flang/Evaluate/target.h"
 #include "flang/Parser/message.h"
-#include "flang/Semantics/module-dependences.h"
 #include "flang/Support/Fortran-features.h"
 #include "flang/Support/LangOptions.h"
 #include <iosfwd>

flang/lib/Optimizer/Dialect/FIRType.cpp

@@ -1419,4 +1419,4 @@ fir::getTypeSizeAndAlignmentOrCrash(mlir::Location loc, mlir::Type ty,
   if (result)
     return *result;
   TODO(loc, "computing size of a component");
-}
+}

flang/lib/Support/CMakeLists.txt

@@ -42,7 +42,6 @@ if(FLANG_VENDOR)
     PROPERTIES COMPILE_DEFINITIONS "FLANG_VENDOR=\"${FLANG_VENDOR} \"")
 endif()
 
-
 add_flang_library(FortranSupport
   Fortran.cpp
   Fortran-features.cpp
@@ -54,8 +53,8 @@ add_flang_library(FortranSupport
   ${version_inc}
 
   LINK_COMPONENTS
-    Support
+  Support
 
   LINK_LIBS
-    MLIRIR
+  MLIRIR
 )

flang/runtime/CUDA/allocatable.cpp

@@ -14,7 +14,6 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/CUDA/memmove-function.h"
 #include "flang/Runtime/allocatable.h"
-#include "flang/Runtime/descriptor.h"
 
 #include "cuda_runtime.h"
 

flang/unittests/Runtime/CUDA/Allocatable.cpp

@@ -13,8 +13,6 @@
 #include "flang/Runtime/CUDA/common.h"
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocator-registry.h"
-#include "flang/Runtime/descriptor.h"
-#include "flang/Runtime/memory.h"
 #include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"

flang/unittests/Runtime/CUDA/AllocatorCUF.cpp

@@ -12,8 +12,6 @@
 #include "flang/Runtime/CUDA/descriptor.h"
 #include "flang/Runtime/allocatable.h"
 #include "flang/Runtime/allocator-registry.h"
-#include "flang/Runtime/descriptor.h"
-#include "flang/Runtime/memory.h"
 #include "flang/Support/Fortran.h"
 
 #include "cuda_runtime.h"