Skip to content

Commit 72e3c5d

Browse files
MeinersburMeinersbur
committed
[Flang] Introduce FortranSupport
1 parent 57466db commit 72e3c5d

File tree

160 files changed

+333
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+333
-332
lines changed

‎flang/include/flang/ISO_Fortran_binding_wrapper.h renamed to ‎flang/include/flang/Common/ISO_Fortran_binding_wrapper.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
/*===-- include/flang/ISO_Fortran_binding_wrapper.h ---------------*- C++ -*-===
1+
/*===-- include/flang/Common/ISO_Fortran_binding_wrapper.h ----------*- C -*-===
22
*
33
* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
* See https://llvm.org/LICENSE.txt for license information.
55
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
*
7-
* ===-----------------------------------------------------------------------===
8-
*/
7+
*===----------------------------------------------------------------------===*/
98

10-
#ifndef FORTRAN_ISO_FORTRAN_BINDING_WRAPPER_H_
11-
#define FORTRAN_ISO_FORTRAN_BINDING_WRAPPER_H_
9+
#ifndef FORTRAN_COMMON_ISO_FORTRAN_BINDING_WRAPPER_H_
10+
#define FORTRAN_COMMON_ISO_FORTRAN_BINDING_WRAPPER_H_
1211

1312
/* A thin wrapper around flang/include/ISO_Fortran_binding.h
1413
* This header file must be included when ISO_Fortran_binding.h
@@ -23,17 +22,17 @@
2322

2423
/* clang-format off */
2524
#include <stddef.h>
26-
#include "Common/api-attrs.h"
25+
#include "flang/Common/api-attrs.h"
2726
#ifdef __cplusplus
2827
namespace Fortran {
2928
namespace ISO {
3029
#define FORTRAN_ISO_NAMESPACE_ ::Fortran::ISO
3130
#endif /* __cplusplus */
32-
#include "ISO_Fortran_binding.h"
31+
#include "flang/ISO_Fortran_binding.h"
3332
#ifdef __cplusplus
3433
} // namespace ISO
3534
} // namespace Fortran
3635
#endif /* __cplusplus */
3736
/* clang-format on */
3837

39-
#endif /* FORTRAN_ISO_FORTRAN_BINDING_WRAPPER_H_ */
38+
#endif /* FORTRAN_COMMON_ISO_FORTRAN_BINDING_WRAPPER_H_ */

‎flang/include/flang/Common/fast-int-set.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef FORTRAN_COMMON_FAST_INT_SET_H_
2525
#define FORTRAN_COMMON_FAST_INT_SET_H_
2626

27-
#include <optional>
27+
#include "optional.h"
2828

2929
namespace Fortran::common {
3030

@@ -83,9 +83,9 @@ template <int N> class FastIntSet {
8383
}
8484
}
8585

86-
std::optional<int> PopValue() {
86+
optional<int> PopValue() {
8787
if (IsEmpty()) {
88-
return std::nullopt;
88+
return nullopt;
8989
} else {
9090
return value_[--size_];
9191
}

‎flang/include/flang/Evaluate/call.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#include "constant.h"
1414
#include "formatting.h"
1515
#include "type.h"
16-
#include "flang/Common/Fortran.h"
17-
#include "flang/Common/indirection.h"
18-
#include "flang/Common/reference.h"
1916
#include "flang/Parser/char-block.h"
2017
#include "flang/Semantics/attr.h"
18+
#include "flang/Support/Fortran.h"
19+
#include "flang/Support/indirection.h"
20+
#include "flang/Support/reference.h"
2121
#include <optional>
2222
#include <vector>
2323

‎flang/include/flang/Evaluate/characteristics.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#include "shape.h"
1919
#include "tools.h"
2020
#include "type.h"
21-
#include "flang/Common/Fortran-features.h"
22-
#include "flang/Common/Fortran.h"
2321
#include "flang/Common/enum-set.h"
2422
#include "flang/Common/idioms.h"
25-
#include "flang/Common/indirection.h"
2623
#include "flang/Parser/char-block.h"
2724
#include "flang/Semantics/symbol.h"
25+
#include "flang/Support/Fortran-features.h"
26+
#include "flang/Support/Fortran.h"
27+
#include "flang/Support/indirection.h"
2828
#include <optional>
2929
#include <string>
3030
#include <variant>

‎flang/include/flang/Evaluate/common.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#ifndef FORTRAN_EVALUATE_COMMON_H_
1010
#define FORTRAN_EVALUATE_COMMON_H_
1111

12-
#include "flang/Common/Fortran-features.h"
13-
#include "flang/Common/Fortran.h"
14-
#include "flang/Common/default-kinds.h"
1512
#include "flang/Common/enum-set.h"
1613
#include "flang/Common/idioms.h"
17-
#include "flang/Common/indirection.h"
1814
#include "flang/Common/restorer.h"
1915
#include "flang/Common/target-rounding.h"
2016
#include "flang/Parser/char-block.h"
2117
#include "flang/Parser/message.h"
18+
#include "flang/Support/Fortran-features.h"
19+
#include "flang/Support/Fortran.h"
20+
#include "flang/Support/default-kinds.h"
21+
#include "flang/Support/indirection.h"
2222
#include <cinttypes>
2323
#include <map>
2424
#include <set>

‎flang/include/flang/Evaluate/constant.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include "formatting.h"
1313
#include "type.h"
14-
#include "flang/Common/default-kinds.h"
15-
#include "flang/Common/reference.h"
14+
#include "flang/Support/default-kinds.h"
15+
#include "flang/Support/reference.h"
1616
#include <map>
1717
#include <vector>
1818

‎flang/include/flang/Evaluate/expression.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#include "formatting.h"
2222
#include "type.h"
2323
#include "variable.h"
24-
#include "flang/Common/Fortran.h"
2524
#include "flang/Common/idioms.h"
26-
#include "flang/Common/indirection.h"
27-
#include "flang/Common/template.h"
2825
#include "flang/Parser/char-block.h"
26+
#include "flang/Support/Fortran.h"
27+
#include "flang/Support/indirection.h"
28+
#include "flang/Support/template.h"
2929
#include <algorithm>
3030
#include <list>
3131
#include <tuple>

‎flang/include/flang/Evaluate/formatting.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// This header is meant to be included by the headers that define the several
2020
// representational class templates that need it, not by external clients.
2121

22-
#include "flang/Common/indirection.h"
22+
#include "flang/Support/indirection.h"
2323
#include "llvm/Support/raw_ostream.h"
2424
#include <optional>
2525
#include <type_traits>

‎flang/include/flang/Evaluate/intrinsics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#include "call.h"
1313
#include "characteristics.h"
1414
#include "type.h"
15-
#include "flang/Common/default-kinds.h"
1615
#include "flang/Parser/char-block.h"
1716
#include "flang/Parser/message.h"
17+
#include "flang/Support/default-kinds.h"
1818
#include <memory>
1919
#include <optional>
2020
#include <string>

‎flang/include/flang/Evaluate/shape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "expression.h"
1616
#include "traverse.h"
1717
#include "variable.h"
18-
#include "flang/Common/indirection.h"
1918
#include "flang/Evaluate/type.h"
19+
#include "flang/Support/indirection.h"
2020
#include <optional>
2121
#include <variant>
2222

‎flang/include/flang/Evaluate/target.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#ifndef FORTRAN_EVALUATE_TARGET_H_
1313
#define FORTRAN_EVALUATE_TARGET_H_
1414

15-
#include "flang/Common/Fortran.h"
1615
#include "flang/Common/enum-class.h"
1716
#include "flang/Common/enum-set.h"
1817
#include "flang/Common/target-rounding.h"
1918
#include "flang/Evaluate/common.h"
19+
#include "flang/Support/Fortran.h"
2020
#include <cstdint>
2121

2222
namespace Fortran::evaluate {

‎flang/include/flang/Evaluate/tools.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
#include "traverse.h"
1313
#include "flang/Common/idioms.h"
14-
#include "flang/Common/template.h"
15-
#include "flang/Common/unwrap.h"
1614
#include "flang/Evaluate/constant.h"
1715
#include "flang/Evaluate/expression.h"
1816
#include "flang/Evaluate/shape.h"
@@ -21,6 +19,8 @@
2119
#include "flang/Semantics/attr.h"
2220
#include "flang/Semantics/scope.h"
2321
#include "flang/Semantics/symbol.h"
22+
#include "flang/Support/template.h"
23+
#include "flang/Support/unwrap.h"
2424
#include <array>
2525
#include <optional>
2626
#include <set>

‎flang/include/flang/Evaluate/traverse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
// expression of an ASSOCIATE (or related) construct entity.
3939

4040
#include "expression.h"
41-
#include "flang/Common/indirection.h"
4241
#include "flang/Semantics/symbol.h"
4342
#include "flang/Semantics/type.h"
43+
#include "flang/Support/indirection.h"
4444
#include <set>
4545
#include <type_traits>
4646

‎flang/include/flang/Evaluate/type.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#include "integer.h"
2323
#include "logical.h"
2424
#include "real.h"
25-
#include "flang/Common/Fortran-features.h"
26-
#include "flang/Common/Fortran.h"
2725
#include "flang/Common/idioms.h"
2826
#include "flang/Common/real.h"
29-
#include "flang/Common/template.h"
27+
#include "flang/Support/Fortran-features.h"
28+
#include "flang/Support/Fortran.h"
29+
#include "flang/Support/template.h"
3030
#include <cinttypes>
3131
#include <optional>
3232
#include <string>

‎flang/include/flang/Evaluate/variable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include "static-data.h"
2222
#include "type.h"
2323
#include "flang/Common/idioms.h"
24-
#include "flang/Common/reference.h"
25-
#include "flang/Common/template.h"
2624
#include "flang/Parser/char-block.h"
25+
#include "flang/Support/reference.h"
26+
#include "flang/Support/template.h"
2727
#include <optional>
2828
#include <variant>
2929
#include <vector>

‎flang/include/flang/Frontend/CompilerInvocation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#ifndef FORTRAN_FRONTEND_COMPILERINVOCATION_H
1414
#define FORTRAN_FRONTEND_COMPILERINVOCATION_H
1515

16-
#include "flang/Common/LangOptions.h"
1716
#include "flang/Frontend/CodeGenOptions.h"
1817
#include "flang/Frontend/FrontendOptions.h"
1918
#include "flang/Frontend/PreprocessorOptions.h"
@@ -22,6 +21,7 @@
2221
#include "flang/Parser/parsing.h"
2322
#include "flang/Semantics/semantics.h"
2423
#include "mlir/Support/Timing.h"
24+
#include "flang/Support/LangOptions.h"
2525
#include "clang/Basic/Diagnostic.h"
2626
#include "clang/Basic/DiagnosticOptions.h"
2727
#include "llvm/Option/ArgList.h"

‎flang/include/flang/Frontend/FrontendOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#ifndef FORTRAN_FRONTEND_FRONTENDOPTIONS_H
1414
#define FORTRAN_FRONTEND_FRONTENDOPTIONS_H
1515

16-
#include "flang/Common/Fortran-features.h"
1716
#include "flang/Lower/EnvironmentDefault.h"
1817
#include "flang/Parser/characters.h"
1918
#include "flang/Parser/unparse.h"
19+
#include "flang/Support/Fortran-features.h"
2020
#include "llvm/ADT/StringRef.h"
2121
#include "llvm/Support/MemoryBuffer.h"
2222
#include <cstdint>

‎flang/include/flang/ISO_Fortran_binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* it does so by means of a wrapper header that establishes namespaces and
1515
* a macro for extra function attributes (RT_API_ATTRS).
1616
*/
17-
#ifndef FORTRAN_ISO_FORTRAN_BINDING_WRAPPER_H_
17+
#ifndef FORTRAN_COMMON_ISO_FORTRAN_BINDING_WRAPPER_H_
1818
#include <stddef.h>
1919
#define FORTRAN_ISO_NAMESPACE_
2020
#endif

‎flang/include/flang/Lower/AbstractConverter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#ifndef FORTRAN_LOWER_ABSTRACTCONVERTER_H
1414
#define FORTRAN_LOWER_ABSTRACTCONVERTER_H
1515

16-
#include "flang/Common/Fortran.h"
1716
#include "flang/Lower/LoweringOptions.h"
1817
#include "flang/Lower/PFTDefs.h"
1918
#include "flang/Optimizer/Builder/BoxValue.h"
2019
#include "flang/Optimizer/Dialect/FIRAttr.h"
2120
#include "flang/Semantics/symbol.h"
21+
#include "flang/Support/Fortran.h"
2222
#include "mlir/IR/Builders.h"
2323
#include "mlir/IR/BuiltinOps.h"
2424
#include "mlir/IR/Operation.h"

‎flang/include/flang/Lower/Bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#ifndef FORTRAN_LOWER_BRIDGE_H
1414
#define FORTRAN_LOWER_BRIDGE_H
1515

16-
#include "flang/Common/Fortran.h"
1716
#include "flang/Frontend/CodeGenOptions.h"
1817
#include "flang/Frontend/TargetOptions.h"
1918
#include "flang/Lower/AbstractConverter.h"
@@ -22,6 +21,7 @@
2221
#include "flang/Lower/StatementContext.h"
2322
#include "flang/Optimizer/Builder/FIRBuilder.h"
2423
#include "flang/Optimizer/Dialect/Support/KindMapping.h"
24+
#include "flang/Support/Fortran.h"
2525
#include "mlir/IR/BuiltinOps.h"
2626
#include "mlir/IR/OwningOpRef.h"
2727
#include <set>

‎flang/include/flang/Lower/CallInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#ifndef FORTRAN_LOWER_CALLINTERFACE_H
2828
#define FORTRAN_LOWER_CALLINTERFACE_H
2929

30-
#include "flang/Common/reference.h"
3130
#include "flang/Evaluate/characteristics.h"
31+
#include "flang/Support/reference.h"
3232
#include "mlir/Dialect/Func/IR/FuncOps.h"
3333
#include "mlir/IR/BuiltinOps.h"
3434
#include <memory>

‎flang/include/flang/Lower/ConvertType.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#ifndef FORTRAN_LOWER_CONVERT_TYPE_H
2222
#define FORTRAN_LOWER_CONVERT_TYPE_H
2323

24-
#include "flang/Common/Fortran.h"
2524
#include "flang/Evaluate/type.h"
25+
#include "flang/Support/Fortran.h"
2626
#include "mlir/IR/BuiltinTypes.h"
2727

2828
namespace mlir {

‎flang/include/flang/Lower/LoweringOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef FLANG_LOWER_LOWERINGOPTIONS_H
1616
#define FLANG_LOWER_LOWERINGOPTIONS_H
1717

18-
#include "flang/Common/MathOptionsBase.h"
18+
#include "flang/Support/MathOptionsBase.h"
1919

2020
namespace Fortran::lower {
2121

‎flang/include/flang/Lower/PFTBuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
#ifndef FORTRAN_LOWER_PFTBUILDER_H
1818
#define FORTRAN_LOWER_PFTBUILDER_H
1919

20-
#include "flang/Common/reference.h"
21-
#include "flang/Common/template.h"
2220
#include "flang/Lower/HostAssociations.h"
2321
#include "flang/Lower/PFTDefs.h"
2422
#include "flang/Parser/parse-tree.h"
2523
#include "flang/Semantics/attr.h"
2624
#include "flang/Semantics/scope.h"
2725
#include "flang/Semantics/semantics.h"
2826
#include "flang/Semantics/symbol.h"
27+
#include "flang/Support/reference.h"
28+
#include "flang/Support/template.h"
2929
#include "llvm/Support/ErrorHandling.h"
3030
#include "llvm/Support/raw_ostream.h"
3131

‎flang/include/flang/Lower/Support/Utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#ifndef FORTRAN_LOWER_SUPPORT_UTILS_H
1414
#define FORTRAN_LOWER_SUPPORT_UTILS_H
1515

16-
#include "flang/Common/indirection.h"
1716
#include "flang/Parser/char-block.h"
1817
#include "flang/Semantics/tools.h"
18+
#include "flang/Support/indirection.h"
1919
#include "mlir/Dialect/Arith/IR/Arith.h"
2020
#include "mlir/Dialect/Func/IR/FuncOps.h"
2121
#include "mlir/IR/BuiltinAttributes.h"

‎flang/include/flang/Lower/SymbolMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#ifndef FORTRAN_LOWER_SYMBOLMAP_H
1414
#define FORTRAN_LOWER_SYMBOLMAP_H
1515

16-
#include "flang/Common/reference.h"
1716
#include "flang/Optimizer/Builder/BoxValue.h"
1817
#include "flang/Optimizer/Dialect/FIRType.h"
1918
#include "flang/Optimizer/Dialect/FortranVariableInterface.h"
2019
#include "flang/Optimizer/Support/Matcher.h"
2120
#include "flang/Semantics/symbol.h"
21+
#include "flang/Support/reference.h"
2222
#include "mlir/IR/Value.h"
2323
#include "llvm/ADT/ArrayRef.h"
2424
#include "llvm/ADT/DenseMap.h"

‎flang/include/flang/Optimizer/Builder/FIRBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#ifndef FORTRAN_OPTIMIZER_BUILDER_FIRBUILDER_H
1717
#define FORTRAN_OPTIMIZER_BUILDER_FIRBUILDER_H
1818

19-
#include "flang/Common/MathOptionsBase.h"
2019
#include "flang/Optimizer/Dialect/FIROps.h"
2120
#include "flang/Optimizer/Dialect/FIROpsSupport.h"
2221
#include "flang/Optimizer/Dialect/FIRType.h"
2322
#include "flang/Optimizer/Dialect/Support/FIRContext.h"
2423
#include "flang/Optimizer/Dialect/Support/KindMapping.h"
24+
#include "flang/Support/MathOptionsBase.h"
2525
#include "mlir/IR/Builders.h"
2626
#include "mlir/IR/BuiltinOps.h"
2727
#include "llvm/ADT/DenseMap.h"

0 commit comments

Comments
 (0)