From 30408f5ccfdfd0b313c6ec8676f92f3501e18efd Mon Sep 17 00:00:00 2001 From: Valentin Clement Date: Mon, 10 Apr 2023 17:01:10 -0700 Subject: [PATCH] [flang][NFC] Move TypeConverter.h header file to include dir After the extraction of the TypeConverter, move the header files to the include dir so the shared library build is fine. Reviewed By: PeteSteinfeld Differential Revision: https://reviews.llvm.org/D147979 --- .../{lib => include/flang}/Optimizer/CodeGen/TBAABuilder.h | 0 flang/{lib => include/flang}/Optimizer/CodeGen/Target.h | 0 .../flang}/Optimizer/CodeGen/TypeConverter.h | 4 ++-- flang/lib/Optimizer/CodeGen/CodeGen.cpp | 2 +- flang/lib/Optimizer/CodeGen/TBAABuilder.cpp | 2 +- flang/lib/Optimizer/CodeGen/Target.cpp | 2 +- flang/lib/Optimizer/CodeGen/TargetRewrite.cpp | 2 +- flang/lib/Optimizer/CodeGen/TypeConverter.cpp | 6 +++--- .../Transforms/OpenACC/OpenACCDataOperandConversion.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename flang/{lib => include/flang}/Optimizer/CodeGen/TBAABuilder.h (100%) rename flang/{lib => include/flang}/Optimizer/CodeGen/Target.h (100%) rename flang/{lib => include/flang}/Optimizer/CodeGen/TypeConverter.h (98%) diff --git a/flang/lib/Optimizer/CodeGen/TBAABuilder.h b/flang/include/flang/Optimizer/CodeGen/TBAABuilder.h similarity index 100% rename from flang/lib/Optimizer/CodeGen/TBAABuilder.h rename to flang/include/flang/Optimizer/CodeGen/TBAABuilder.h diff --git a/flang/lib/Optimizer/CodeGen/Target.h b/flang/include/flang/Optimizer/CodeGen/Target.h similarity index 100% rename from flang/lib/Optimizer/CodeGen/Target.h rename to flang/include/flang/Optimizer/CodeGen/Target.h diff --git a/flang/lib/Optimizer/CodeGen/TypeConverter.h b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h similarity index 98% rename from flang/lib/Optimizer/CodeGen/TypeConverter.h rename to flang/include/flang/Optimizer/CodeGen/TypeConverter.h index d2bcfd14162e..4131eb53f076 100644 --- a/flang/lib/Optimizer/CodeGen/TypeConverter.h +++ b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h @@ -13,9 +13,9 @@ #ifndef FORTRAN_OPTIMIZER_CODEGEN_TYPECONVERTER_H #define FORTRAN_OPTIMIZER_CODEGEN_TYPECONVERTER_H -#include "TBAABuilder.h" -#include "Target.h" #include "flang/Optimizer/Builder/Todo.h" // remove when TODO's are done +#include "flang/Optimizer/CodeGen/TBAABuilder.h" +#include "flang/Optimizer/CodeGen/Target.h" #include "flang/Optimizer/Dialect/FIRType.h" #include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Dialect/Support/KindMapping.h" diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp index d294fb4d676f..bbec5fc9d349 100644 --- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp +++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp @@ -54,7 +54,7 @@ namespace fir { #define DEBUG_TYPE "flang-codegen" // fir::LLVMTypeConverter for converting to LLVM IR dialect types. -#include "TypeConverter.h" +#include "flang/Optimizer/CodeGen/TypeConverter.h" // TODO: This should really be recovered from the specified target. static constexpr unsigned defaultAlign = 8; diff --git a/flang/lib/Optimizer/CodeGen/TBAABuilder.cpp b/flang/lib/Optimizer/CodeGen/TBAABuilder.cpp index 74269e710b94..ffc72c7d2f02 100644 --- a/flang/lib/Optimizer/CodeGen/TBAABuilder.cpp +++ b/flang/lib/Optimizer/CodeGen/TBAABuilder.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "TBAABuilder.h" +#include "flang/Optimizer/CodeGen/TBAABuilder.h" #include "flang/Optimizer/Dialect/FIRType.h" #include "llvm/ADT/TypeSwitch.h" #include "llvm/Support/CommandLine.h" diff --git a/flang/lib/Optimizer/CodeGen/Target.cpp b/flang/lib/Optimizer/CodeGen/Target.cpp index 50d144909a1c..ffebd550fd6f 100644 --- a/flang/lib/Optimizer/CodeGen/Target.cpp +++ b/flang/lib/Optimizer/CodeGen/Target.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "Target.h" +#include "flang/Optimizer/CodeGen/Target.h" #include "flang/Optimizer/Builder/Todo.h" #include "flang/Optimizer/Dialect/FIRType.h" #include "flang/Optimizer/Dialect/Support/KindMapping.h" diff --git a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp index 0957e399f4e5..813e32eeced9 100644 --- a/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp +++ b/flang/lib/Optimizer/CodeGen/TargetRewrite.cpp @@ -16,10 +16,10 @@ #include "flang/Optimizer/CodeGen/CodeGen.h" -#include "Target.h" #include "flang/Optimizer/Builder/Character.h" #include "flang/Optimizer/Builder/FIRBuilder.h" #include "flang/Optimizer/Builder/Todo.h" +#include "flang/Optimizer/CodeGen/Target.h" #include "flang/Optimizer/Dialect/FIRDialect.h" #include "flang/Optimizer/Dialect/FIROps.h" #include "flang/Optimizer/Dialect/FIROpsSupport.h" diff --git a/flang/lib/Optimizer/CodeGen/TypeConverter.cpp b/flang/lib/Optimizer/CodeGen/TypeConverter.cpp index e6d8f62e7ec5..0cac01c4bba5 100644 --- a/flang/lib/Optimizer/CodeGen/TypeConverter.cpp +++ b/flang/lib/Optimizer/CodeGen/TypeConverter.cpp @@ -12,11 +12,11 @@ #define DEBUG_TYPE "flang-type-conversion" -#include "TypeConverter.h" +#include "flang/Optimizer/CodeGen/TypeConverter.h" #include "DescriptorModel.h" -#include "TBAABuilder.h" -#include "Target.h" #include "flang/Optimizer/Builder/Todo.h" // remove when TODO's are done +#include "flang/Optimizer/CodeGen/TBAABuilder.h" +#include "flang/Optimizer/CodeGen/Target.h" #include "flang/Optimizer/Dialect/FIRType.h" #include "flang/Optimizer/Dialect/Support/FIRContext.h" #include "flang/Optimizer/Dialect/Support/KindMapping.h" diff --git a/flang/lib/Optimizer/Transforms/OpenACC/OpenACCDataOperandConversion.cpp b/flang/lib/Optimizer/Transforms/OpenACC/OpenACCDataOperandConversion.cpp index 1f3a71ea1d7e..b27795eca39a 100644 --- a/flang/lib/Optimizer/Transforms/OpenACC/OpenACCDataOperandConversion.cpp +++ b/flang/lib/Optimizer/Transforms/OpenACC/OpenACCDataOperandConversion.cpp @@ -23,7 +23,7 @@ namespace fir { } // namespace fir #define DEBUG_TYPE "flang-openacc-conversion" -#include "../CodeGen/TypeConverter.h" +#include "flang/Optimizer/CodeGen/TypeConverter.h" using namespace fir; using namespace mlir;