[flang][nfc] Add missing headers in TypeConverter.h

[awarzynski]

Summary

These missing header files wouldn't cause build failures as TypeConverter.h
is currently only included in CodeGen.cpp and that file includes everything
that's needed in TypeConverter.h. However, as per [1], "(...)
include all of the header files that you are using ".

I've also added missing namespace qualifiers in 2 places.

[1] https://llvm.org/docs/CodingStandards.html#include-as-little-as-possible

[clementval]

We should also probably clean up CodeGen.cpp while adding the headers here.

flang/lib/Optimizer/CodeGen/TypeConverter.h

23

I don't think this one is needed.

[awarzynski]

Remove #include "llvm/ADT/StringMap.h"

[awarzynski]

In D113569#3121587, @clementval wrote:

We should also probably clean up CodeGen.cpp while adding the headers here.

I can trim the list of #includes in CodeGen.cpp, but there's a danger that I remove something that *is* used (but everything will build fine as it will be included with some other header file). Or did you you have something else in mind?

[clementval]

In D113569#3121628, @awarzynski wrote:

In D113569#3121587, @clementval wrote:

We should also probably clean up CodeGen.cpp while adding the headers here.

I can trim the list of #includes in CodeGen.cpp, but there's a danger that I remove something that *is* used (but everything will build fine as it will be included with some other header file). Or did you you have something else in mind?

That's what I had in mind. Some includes are in CodeGen.cpp only for TypeConverter.h

flang/lib/Optimizer/CodeGen/TypeConverter.h

273

[awarzynski]

Remove #includes from CodeGen.cpp that belong in TypeConverter.h

[awarzynski]

Address the remaining comments

[clementval]

LGTM. Thanks.

[awarzynski]

FYI: I've updated the summary/commit msg before merging this in. The original one (at the top) is a bit out-of-sync after the updates.

flang/lib/Optimizer/CodeGen/CodeGen.cpp

 //===-- CodeGen.cpp -- bridge to lower to LLVM ----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // Coding style: https://mlir.llvm.org/getting_started/DeveloperGuide/
 //
 //===----------------------------------------------------------------------===//
 
 #include "flang/Optimizer/CodeGen/CodeGen.h"
 #include "PassDetail.h"
 #include "flang/ISO_Fortran_binding.h"
 #include "flang/Optimizer/Dialect/FIROps.h"
-#include "flang/Optimizer/Dialect/FIRType.h"
-#include "flang/Optimizer/Support/FIRContext.h"
 #include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h"
 #include "mlir/Conversion/LLVMCommon/Pattern.h"
-#include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/Pass/Pass.h"
 #include "llvm/ADT/ArrayRef.h"
 
 #define DEBUG_TYPE "flang-codegen"
 

flang/lib/Optimizer/CodeGen/TypeConverter.h

 //===----------------------------------------------------------------------===//
 
 #ifndef FORTRAN_OPTIMIZER_CODEGEN_TYPECONVERTER_H
 #define FORTRAN_OPTIMIZER_CODEGEN_TYPECONVERTER_H
 
 #include "DescriptorModel.h"
 #include "Target.h"
 #include "flang/Lower/Todo.h" // remove when TODO's are done
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "flang/Optimizer/Support/FIRContext.h"
 #include "flang/Optimizer/Support/KindMapping.h"
-#include "llvm/ADT/StringMap.h"
+#include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "llvm/Support/Debug.h"
 
 // Position of the different values in a `fir.box`.
 static constexpr unsigned kAddrPosInBox = 0;
 static constexpr unsigned kElemLenPosInBox = 1;
 static constexpr unsigned kVersionPosInBox = 2;
 static constexpr unsigned kRankPosInBox = 3;
 static constexpr unsigned kTypePosInBox = 4;
 static constexpr unsigned kAttributePosInBox = 5;
public:
   // Magic value to indicate we do not know the rank of an entity, either
   // because it is assumed rank or because we have not determined it yet.
   static constexpr int unknownRank() { return -1; }
 
   // This corresponds to the descriptor as defined in ISO_Fortran_binding.h and
   // the addendum defined in descriptor.h.
   mlir::Type convertBoxType(BoxType box, int rank = unknownRank()) {
     // (base_addr*, elem_len, version, rank, type, attribute, f18Addendum, [dim]
-    SmallVector<mlir::Type> dataDescFields;
+    llvm::SmallVector<mlir::Type> dataDescFields;
     mlir::Type ele = box.getEleTy();
     // remove fir.heap/fir.ref/fir.ptr
     if (auto removeIndirection = fir::dyn_cast_ptrEleTy(ele))
       ele = removeIndirection;
     auto eleTy = convertType(ele);
     // base_addr*
     if (ele.isa<SequenceType>() && eleTy.isa<mlir::LLVM::LLVMPointerType>())
       dataDescFields.push_back(eleTy);
case llvm::Type::TypeID::FloatTyID:
       return mlir::FloatType::getF32(&getContext());
     case llvm::Type::TypeID::DoubleTyID:
       return mlir::FloatType::getF64(&getContext());
     case llvm::Type::TypeID::X86_FP80TyID:
       return mlir::FloatType::getF80(&getContext());
     case llvm::Type::TypeID::FP128TyID:
       return mlir::FloatType::getF128(&getContext());
     default:
-      emitError(UnknownLoc::get(&getContext()))
+      mlir::emitError(mlir::UnknownLoc::get(&getContext()))
           << "unsupported type: !fir.real<" << kind << ">";
       return {};
     }
   }
 
   KindMapping &getKindMap() { return kindMapping; }
 
 private:
   KindMapping kindMapping;
   std::unique_ptr<CodeGenSpecifics> specifics;
 };
 
 } // namespace fir
 
 #endif // FORTRAN_OPTIMIZER_CODEGEN_TYPECONVERTER_H