fall out from directory renaming - change all the include directives …

…everywhere
schweitzpgi · Feb 26, 2020 · 2ff5524 · 2ff5524
1 parent a54398d
commit 2ff5524
Show file tree

Hide file tree

Showing 28 changed files with 136 additions and 136 deletions.
diff --git a/include/flang/Lower/Bridge.h b/include/flang/Lower/Bridge.h
@@ -17,7 +17,7 @@
 #ifndef FORTRAN_LOWER_BRIDGE_H_
 #define FORTRAN_LOWER_BRIDGE_H_
 
-#include "flang/common/Fortran.h"
+#include "flang/Common/Fortran.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Module.h"
 #include <memory>

diff --git a/include/flang/Lower/ConvertType.h b/include/flang/Lower/ConvertType.h
@@ -17,7 +17,7 @@
 ///
 /// [Coding style](https://llvm.org/docs/CodingStandards.html)
 
-#include "flang/common/Fortran.h"
+#include "flang/Common/Fortran.h"
 #include "mlir/IR/Types.h"
 
 namespace mlir {

diff --git a/include/flang/Lower/OpBuilder.h b/include/flang/Lower/OpBuilder.h
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_LOWER_BUILDER_H_
 #define FORTRAN_LOWER_BUILDER_H_
 
-#include "flang/semantics/symbol.h"
+#include "flang/Semantics/symbol.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/Module.h"

diff --git a/include/flang/Lower/Utils.h b/include/flang/Lower/Utils.h
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_LOWER_UTILS_H
 #define FORTRAN_LOWER_UTILS_H
 
-#include "flang/parser/char-block.h"
+#include "flang/Parser/char-block.h"
 #include "llvm/ADT/StringRef.h"
 
 /// Convert an F18 CharBlock to an LLVM StringRef

diff --git a/include/flang/Optimizer/Dialect/FIROpsSupport.h b/include/flang/Optimizer/Dialect/FIROpsSupport.h
@@ -9,7 +9,7 @@
 #ifndef OPTIMIZER_DIALECT_FIROPSSUPPORT_H
 #define OPTIMIZER_DIALECT_FIROPSSUPPORT_H
 
-#include "flang/optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 
 namespace fir {

diff --git a/lib/Lower/Bridge.cpp b/lib/Lower/Bridge.cpp
@@ -6,21 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/Bridge.h"
-#include "flang/lower/ConvertExpr.h"
-#include "flang/lower/ConvertType.h"
-#include "flang/lower/IO.h"
-#include "flang/lower/Intrinsics.h"
-#include "flang/lower/Mangler.h"
-#include "flang/lower/OpBuilder.h"
-#include "flang/lower/PFTBuilder.h"
-#include "flang/lower/Runtime.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/optimizer/Support/InternalNames.h"
-#include "flang/parser/parse-tree.h"
-#include "flang/semantics/tools.h"
+#include "flang/Lower/Bridge.h"
+#include "flang/Lower/ConvertExpr.h"
+#include "flang/Lower/ConvertType.h"
+#include "flang/Lower/IO.h"
+#include "flang/Lower/Intrinsics.h"
+#include "flang/Lower/Mangler.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Lower/PFTBuilder.h"
+#include "flang/Lower/Runtime.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Support/InternalNames.h"
+#include "flang/Parser/parse-tree.h"
+#include "flang/Semantics/tools.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Builders.h"

diff --git a/lib/Lower/ConvertExpr.cpp b/lib/Lower/ConvertExpr.cpp
@@ -6,21 +6,21 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/ConvertExpr.h"
-#include "flang/common/default-kinds.h"
-#include "flang/common/unwrap.h"
-#include "flang/evaluate/fold.h"
-#include "flang/evaluate/real.h"
-#include "flang/lower/Bridge.h"
-#include "flang/lower/ConvertType.h"
-#include "flang/lower/OpBuilder.h"
-#include "flang/lower/Runtime.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/semantics/expression.h"
-#include "flang/semantics/symbol.h"
-#include "flang/semantics/type.h"
+#include "flang/Lower/ConvertExpr.h"
+#include "flang/Common/default-kinds.h"
+#include "flang/Common/unwrap.h"
+#include "flang/Evaluate/fold.h"
+#include "flang/Evaluate/real.h"
+#include "flang/Lower/Bridge.h"
+#include "flang/Lower/ConvertType.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Lower/Runtime.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Semantics/expression.h"
+#include "flang/Semantics/symbol.h"
+#include "flang/Semantics/type.h"
 #include "mlir/Dialect/AffineOps/AffineOps.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"

diff --git a/lib/Lower/ConvertType.cpp b/lib/Lower/ConvertType.cpp
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/ConvertType.h"
+#include "flang/Lower/ConvertType.h"
 #include "../../runtime/io-api.h"
-#include "flang/lower/Bridge.h"
-#include "flang/lower/Utils.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/semantics/expression.h"
-#include "flang/semantics/tools.h"
-#include "flang/semantics/type.h"
+#include "flang/Lower/Bridge.h"
+#include "flang/Lower/Utils.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Semantics/expression.h"
+#include "flang/Semantics/tools.h"
+#include "flang/Semantics/type.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"

diff --git a/lib/Lower/IO.cpp b/lib/Lower/IO.cpp
@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/IO.h"
+#include "flang/Lower/IO.h"
 #include "../../runtime/io-api.h"
 #include "RTBuilder.h"
-#include "flang/lower/Bridge.h"
-#include "flang/lower/OpBuilder.h"
-#include "flang/lower/Runtime.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/parser/parse-tree.h"
-#include "flang/semantics/tools.h"
+#include "flang/Lower/Bridge.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Lower/Runtime.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Parser/parse-tree.h"
+#include "flang/Semantics/tools.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Builders.h"
 

diff --git a/lib/Lower/Intrinsics.cpp b/lib/Lower/Intrinsics.cpp
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/Intrinsics.h"
-#include "flang/lower/ConvertType.h"
-#include "flang/lower/OpBuilder.h"
-#include "flang/lower/Runtime.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Lower/Intrinsics.h"
+#include "flang/Lower/ConvertType.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Lower/Runtime.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/Twine.h"
 #include <algorithm>

diff --git a/lib/Lower/Mangler.cpp b/lib/Lower/Mangler.cpp
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/Mangler.h"
-#include "flang/common/reference.h"
-#include "flang/lower/Utils.h"
-#include "flang/optimizer/Support/InternalNames.h"
-#include "flang/semantics/tools.h"
+#include "flang/Lower/Mangler.h"
+#include "flang/Common/reference.h"
+#include "flang/Lower/Utils.h"
+#include "flang/Optimizer/Support/InternalNames.h"
+#include "flang/Semantics/tools.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/lib/Lower/OpBuilder.cpp b/lib/Lower/OpBuilder.cpp
@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/OpBuilder.h"
-#include "flang/lower/Bridge.h"
-#include "flang/lower/ConvertType.h"
-#include "flang/optimizer/Dialect/FIROpsSupport.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Lower/Bridge.h"
+#include "flang/Lower/ConvertType.h"
+#include "flang/Optimizer/Dialect/FIROpsSupport.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/IR/Module.h"
 #include "mlir/IR/Value.h"
 #include "llvm/ADT/StringRef.h"

diff --git a/lib/Lower/RTBuilder.h b/lib/Lower/RTBuilder.h
@@ -17,8 +17,8 @@
 #ifndef FORTRAN_LOWER_RT_BUILDER_H_
 #define FORTRAN_LOWER_RT_BUILDER_H_
 
-#include "flang/lower/ConvertType.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Lower/ConvertType.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/StandardTypes.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/lib/Lower/Runtime.cpp b/lib/Lower/Runtime.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/lower/Runtime.h"
-#include "flang/lower/OpBuilder.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Lower/Runtime.h"
+#include "flang/Lower/OpBuilder.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "llvm/ADT/SmallVector.h"

diff --git a/lib/Optimizer/CodeGen.cpp b/lib/Optimizer/CodeGen.cpp
@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/CodeGen/CodeGen.h"
-#include "flang/optimizer/Dialect/FIRAttr.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/optimizer/Support/InternalNames.h"
-#include "flang/optimizer/Support/KindMapping.h"
+#include "flang/Optimizer/CodeGen/CodeGen.h"
+#include "flang/Optimizer/Dialect/FIRAttr.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Support/InternalNames.h"
+#include "flang/Optimizer/Support/KindMapping.h"
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h"
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h"
 #include "mlir/Dialect/AffineOps/AffineOps.h"

diff --git a/lib/Optimizer/Dialect/FIRAttr.cpp b/lib/Optimizer/Dialect/FIRAttr.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Dialect/FIRAttr.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/optimizer/Support/KindMapping.h"
+#include "flang/Optimizer/Dialect/FIRAttr.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Support/KindMapping.h"
 #include "mlir/IR/AttributeSupport.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/DialectImplementation.h"

diff --git a/lib/Optimizer/Dialect/FIRDialect.cpp b/lib/Optimizer/Dialect/FIRDialect.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIRAttr.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIRAttr.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Transforms/SideEffectsInterface.h"

diff --git a/lib/Optimizer/Dialect/FIROps.cpp b/lib/Optimizer/Dialect/FIROps.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Dialect/FIRAttr.h"
-#include "flang/optimizer/Dialect/FIROpsSupport.h"
-#include "flang/optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Dialect/FIRAttr.h"
+#include "flang/Optimizer/Dialect/FIROpsSupport.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Function.h"

diff --git a/lib/Optimizer/Dialect/FIRType.cpp b/lib/Optimizer/Dialect/FIRType.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Dialect.h"

diff --git a/lib/Optimizer/IteratedDominanceFrontier.cpp b/lib/Optimizer/IteratedDominanceFrontier.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Analysis/IteratedDominanceFrontier.h"
+#include "flang/Optimizer/Analysis/IteratedDominanceFrontier.h"
 #include "mlir/Analysis/Dominance.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"

diff --git a/lib/Optimizer/StdConverter.cpp b/lib/Optimizer/StdConverter.cpp
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Transforms/StdConverter.h"
-#include "flang/optimizer/Dialect/FIRAttr.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIROpsSupport.h"
-#include "flang/optimizer/Dialect/FIRType.h"
-#include "flang/optimizer/Support/KindMapping.h"
+#include "flang/Optimizer/Transforms/StdConverter.h"
+#include "flang/Optimizer/Dialect/FIRAttr.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIROpsSupport.h"
+#include "flang/Optimizer/Dialect/FIRType.h"
+#include "flang/Optimizer/Support/KindMapping.h"
 #include "mlir/Conversion/AffineToStandard/AffineToStandard.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/StandardTypes.h"

diff --git a/lib/Optimizer/Support/InternalNames.cpp b/lib/Optimizer/Support/InternalNames.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Support/InternalNames.h"
+#include "flang/Optimizer/Support/InternalNames.h"
 #include "mlir/IR/Diagnostics.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/Twine.h"

diff --git a/lib/Optimizer/Support/KindMapping.cpp b/lib/Optimizer/Support/KindMapping.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Support/KindMapping.h"
+#include "flang/Optimizer/Support/KindMapping.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/Support/CommandLine.h"

diff --git a/lib/Optimizer/Transforms/CSE.cpp b/lib/Optimizer/Transforms/CSE.cpp
@@ -12,8 +12,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Dialect/FIROpsSupport.h"
-#include "flang/optimizer/Transforms/Passes.h"
+#include "flang/Optimizer/Dialect/FIROpsSupport.h"
+#include "flang/Optimizer/Transforms/Passes.h"
 #include "mlir/Analysis/Dominance.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"

diff --git a/lib/Optimizer/Transforms/MemToReg.cpp b/lib/Optimizer/Transforms/MemToReg.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang/optimizer/Analysis/IteratedDominanceFrontier.h"
-#include "flang/optimizer/Dialect/FIRDialect.h"
-#include "flang/optimizer/Dialect/FIROps.h"
-#include "flang/optimizer/Transforms/Passes.h"
+#include "flang/Optimizer/Analysis/IteratedDominanceFrontier.h"
+#include "flang/Optimizer/Dialect/FIRDialect.h"
+#include "flang/Optimizer/Dialect/FIROps.h"
+#include "flang/Optimizer/Transforms/Passes.h"
 #include "mlir/Analysis/Dominance.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Pass/Pass.h"