From 6e6e40ae79e3c35806c5cbf239b7d7c84efe3df0 Mon Sep 17 00:00:00 2001
From: River Riddle <riverriddle@google.com>
Date: Thu, 25 Oct 2018 22:39:14 -0700
Subject: [PATCH] Move AffineMap.h/IntegerSet.h from Attributes.h to
 AttributeDetail.h where they belong.

PiperOrigin-RevId: 218806426
---
 mlir/include/mlir/IR/Attributes.h      | 7 +++----
 mlir/include/mlir/IR/BuiltinOps.h      | 1 +
 mlir/lib/Analysis/AffineStructures.cpp | 2 +-
 mlir/lib/IR/AttributeDetail.h          | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h
index ebe05c328958..31ad77c6e200 100644
--- a/mlir/include/mlir/IR/Attributes.h
+++ b/mlir/include/mlir/IR/Attributes.h
@@ -18,16 +18,15 @@
 #ifndef MLIR_IR_ATTRIBUTES_H
 #define MLIR_IR_ATTRIBUTES_H
 
-#include "mlir/IR/AffineMap.h"
-#include "mlir/IR/IntegerSet.h"
 #include "mlir/Support/LLVM.h"
 #include "llvm/ADT/APFloat.h"
-#include "llvm/Support/TrailingObjects.h"
+#include "llvm/ADT/DenseMapInfo.h"
 
 namespace mlir {
-
+class AffineMap;
 class Function;
 class FunctionType;
+class IntegerSet;
 class MLIRContext;
 class Type;
 class VectorOrTensorType;
diff --git a/mlir/include/mlir/IR/BuiltinOps.h b/mlir/include/mlir/IR/BuiltinOps.h
index b2759d23205a..88d4d812ba07 100644
--- a/mlir/include/mlir/IR/BuiltinOps.h
+++ b/mlir/include/mlir/IR/BuiltinOps.h
@@ -23,6 +23,7 @@
 #ifndef MLIR_IR_BUILTINOPS_H
 #define MLIR_IR_BUILTINOPS_H
 
+#include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
diff --git a/mlir/lib/Analysis/AffineStructures.cpp b/mlir/lib/Analysis/AffineStructures.cpp
index 5adabec5e104..797350ed29f0 100644
--- a/mlir/lib/Analysis/AffineStructures.cpp
+++ b/mlir/lib/Analysis/AffineStructures.cpp
@@ -22,11 +22,11 @@
 #include "mlir/Analysis/AffineStructures.h"
 #include "mlir/Analysis/AffineAnalysis.h"
 #include "mlir/IR/AffineExprVisitor.h"
+#include "mlir/IR/AffineMap.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/MLValue.h"
 #include "mlir/Support/MathExtras.h"
-#include "third_party/llvm/llvm/projects/google-mlir/include/mlir/Analysis/AffineStructures.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/mlir/lib/IR/AttributeDetail.h b/mlir/lib/IR/AttributeDetail.h
index e0e9663b837d..a0e9afb4fd38 100644
--- a/mlir/lib/IR/AttributeDetail.h
+++ b/mlir/lib/IR/AttributeDetail.h
@@ -22,8 +22,11 @@
 #ifndef ATTRIBUTEDETAIL_H_
 #define ATTRIBUTEDETAIL_H_
 
+#include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Attributes.h"
+#include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/MLIRContext.h"
+#include "llvm/Support/TrailingObjects.h"
 
 namespace mlir {
 namespace detail {