[CIR] Move CIRDataLayout.h into include/clang/CIR/Dialect/IR (llvm#621)

Move it up for visibility, just like the other dialect headers.
keryell · Oct 12, 2024 · 4edb5f2 · 4edb5f2
1 parent eafa861
commit 4edb5f2
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/clang/lib/CIR/CodeGen/CIRDataLayout.h → ...lude/clang/CIR/Dialect/IR/CIRDataLayout.h b/clang/lib/CIR/CodeGen/CIRDataLayout.h → ...lude/clang/CIR/Dialect/IR/CIRDataLayout.h
@@ -9,10 +9,9 @@
 // it easier to port some of LLVM codegen layout logic to CIR.
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_LIB_CIR_CIRDATALAYOUT_H
-#define LLVM_CLANG_LIB_CIR_CIRDATALAYOUT_H
+#ifndef LLVM_CLANG_CIR_DIALECT_IR_CIRDATALAYOUT_H
+#define LLVM_CLANG_CIR_DIALECT_IR_CIRDATALAYOUT_H
 
-#include "UnimplementedFeatureGuarding.h"
 #include "mlir/Dialect/DLTI/DLTI.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
@@ -92,4 +91,4 @@ class CIRDataLayout {
 
 } // namespace cir
 
-#endif
+#endif
diff --git a/clang/lib/CIR/CodeGen/CIRGenAtomic.cpp b/clang/lib/CIR/CodeGen/CIRGenAtomic.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Address.h"
-#include "CIRDataLayout.h"
+
 #include "CIRGenFunction.h"
 #include "CIRGenModule.h"
 #include "CIRGenOpenMPRuntime.h"
@@ -20,6 +20,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"

diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
@@ -10,7 +10,6 @@
 #define LLVM_CLANG_LIB_CIR_CIRGENBUILDER_H
 
 #include "Address.h"
-#include "CIRDataLayout.h"
 #include "CIRGenRecordLayout.h"
 #include "CIRGenTypeCache.h"
 #include "UnimplementedFeatureGuarding.h"
@@ -19,6 +18,7 @@
 #include "clang/AST/Type.h"
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"

diff --git a/clang/lib/CIR/CodeGen/CIRGenDecl.cpp b/clang/lib/CIR/CodeGen/CIRGenDecl.cpp
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CIRDataLayout.h"
 #include "CIRGenBuilder.h"
 #include "CIRGenCstEmitter.h"
 #include "CIRGenFunction.h"
@@ -24,6 +23,7 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/ExprCXX.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -824,7 +824,7 @@ void CIRGenFunction::buildDecl(const Decl &D) {
     return;
 
   case Decl::NamespaceAlias:
-  case Decl::Using: // using X; [C++]
+  case Decl::Using:          // using X; [C++]
   case Decl::UsingEnum:      // using enum X; [C++]
   case Decl::UsingDirective: // using namespace X; [C++]
     assert(!UnimplementedFeature::generateDebugInfo());

diff --git a/clang/lib/CIR/CodeGen/CIRGenException.cpp b/clang/lib/CIR/CodeGen/CIRGenException.cpp
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CIRDataLayout.h"
 #include "CIRGenCXXABI.h"
 #include "CIRGenCleanup.h"
 #include "CIRGenFunction.h"
@@ -19,6 +18,7 @@
 
 #include "clang/AST/StmtVisitor.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
@@ -886,4 +886,4 @@ mlir::Operation *CIRGenFunction::getInvokeDestImpl() {
 
 mlir::Operation *CIRGenFunction::getTerminateLandingPad() {
   llvm_unreachable("NYI");
-}
+}
diff --git a/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp b/clang/lib/CIR/CodeGen/CIRGenExprConst.cpp
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 #include "Address.h"
-#include "CIRDataLayout.h"
 #include "CIRGenCstEmitter.h"
 #include "CIRGenFunction.h"
 #include "CIRGenModule.h"
@@ -25,6 +24,7 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Sequence.h"
@@ -1875,4 +1875,4 @@ mlir::Attribute ConstantEmitter::emitNullForMemory(mlir::Location loc,
       CGM.buildNullConstant(T, loc).getDefiningOp());
   assert(cstOp && "expected cir.const op");
   return emitForMemory(CGM, cstOp.getValue(), T);
-}
+}
diff --git a/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp b/clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp
@@ -11,14 +11,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "Address.h"
-#include "CIRDataLayout.h"
 #include "CIRGenFunction.h"
 #include "CIRGenModule.h"
 #include "CIRGenOpenMPRuntime.h"
 #include "UnimplementedFeatureGuarding.h"
 
 #include "clang/AST/StmtVisitor.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"

diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.h b/clang/lib/CIR/CodeGen/CIRGenModule.h
@@ -13,7 +13,6 @@
 #ifndef LLVM_CLANG_LIB_CODEGEN_CIRGENMODULE_H
 #define LLVM_CLANG_LIB_CODEGEN_CIRGENMODULE_H
 
-#include "CIRDataLayout.h"
 #include "CIRGenBuilder.h"
 #include "CIRGenCall.h"
 #include "CIRGenTypeCache.h"
@@ -27,6 +26,7 @@
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
@@ -222,10 +222,10 @@ class CIRGenModule : public CIRGenTypeCache {
   mlir::cir::GlobalOp getOrInsertGlobal(mlir::Location loc, StringRef Name,
                                         mlir::Type Ty);
 
-  static mlir::cir::GlobalOp createGlobalOp(CIRGenModule &CGM,
-                                            mlir::Location loc, StringRef name,
-                                            mlir::Type t, bool isCst = false,
-                                            mlir::Operation *insertPoint = nullptr);
+  static mlir::cir::GlobalOp
+  createGlobalOp(CIRGenModule &CGM, mlir::Location loc, StringRef name,
+                 mlir::Type t, bool isCst = false,
+                 mlir::Operation *insertPoint = nullptr);
 
   // FIXME: Hardcoding priority here is gross.
   void AddGlobalCtor(mlir::cir::FuncOp Ctor, int Priority = 65535);

diff --git a/clang/lib/CIR/CodeGen/CIRRecordLayoutBuilder.cpp b/clang/lib/CIR/CodeGen/CIRRecordLayoutBuilder.cpp
@@ -1,5 +1,4 @@
 
-#include "CIRDataLayout.h"
 #include "CIRGenBuilder.h"
 #include "CIRGenModule.h"
 #include "CIRGenTypes.h"
@@ -10,6 +9,7 @@
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/RecordLayout.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"