Skip to content

Commit ccd32eb

Browse files
committed
NFC: Remove ClangModuleLoader.h include from ExtInfo.h
This was unnecessarily pulling in a whole bunch of Clang headers when all was needed was a forward declaration.
1 parent 062fd6e commit ccd32eb

21 files changed

+29
-5
lines changed

include/swift/AST/ASTContext.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ namespace swift {
9292
class LazyIterableDeclContextData;
9393
class LazyMemberLoader;
9494
struct MacroDiscriminatorContext;
95+
class ModuleInterfaceChecker;
9596
class PatternBindingDecl;
9697
class PatternBindingInitializer;
9798
class PluginLoader;
9899
class SourceFile;
99100
class SourceLoc;
101+
struct TemplateInstantiationError;
100102
class Type;
101103
class TypeVariableType;
102104
class TupleType;

include/swift/AST/ASTMangler.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
namespace clang {
2424
class NamedDecl;
25+
class TypedefType;
2526
}
2627

2728
namespace swift {

include/swift/AST/ASTPrinter.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "swift/Basic/UUID.h"
1919
#include "swift/AST/Identifier.h"
2020
#include "swift/AST/Decl.h"
21+
#include "clang/AST/Decl.h"
2122
#include "llvm/ADT/SmallString.h"
2223
#include "llvm/ADT/StringRef.h"
2324
#include "llvm/ADT/DenseSet.h"
@@ -28,10 +29,6 @@
2829
// ambiguities with type names, in AliasModuleNames mode.
2930
#define MODULE_DISAMBIGUATING_PREFIX "Module___"
3031

31-
namespace clang {
32-
class Decl;
33-
}
34-
3532
namespace swift {
3633
class Decl;
3734
class DeclContext;

include/swift/AST/Decl.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "swift/AST/FreestandingMacroExpansion.h"
2929
#include "swift/AST/GenericParamKey.h"
3030
#include "swift/AST/IfConfigClause.h"
31+
#include "swift/AST/Import.h"
3132
#include "swift/AST/LayoutConstraint.h"
3233
#include "swift/AST/LifetimeAnnotation.h"
3334
#include "swift/AST/ReferenceCounting.h"
@@ -42,14 +43,20 @@
4243
#include "swift/Basic/Debug.h"
4344
#include "swift/Basic/InlineBitfield.h"
4445
#include "swift/Basic/Located.h"
46+
#include "swift/Basic/Nullability.h"
4547
#include "swift/Basic/NullablePtr.h"
4648
#include "swift/Basic/OptionalEnum.h"
4749
#include "swift/Basic/Range.h"
4850
#include "llvm/ADT/DenseSet.h"
51+
#include "llvm/ADT/TinyPtrVector.h"
4952
#include "llvm/Support/TrailingObjects.h"
5053
#include <map>
5154
#include <type_traits>
5255

56+
namespace clang {
57+
class PointerAuthQualifier;
58+
} // end namespace clang
59+
5360
namespace swift {
5461
enum class AccessSemantics : unsigned char;
5562
class AccessorDecl;

include/swift/AST/ExtInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define SWIFT_EXTINFO_H
2222

2323
#include "swift/AST/AutoDiff.h"
24-
#include "swift/AST/ClangModuleLoader.h"
2524

2625
#include "llvm/ADT/None.h"
2726
#include "llvm/ADT/Optional.h"
@@ -38,6 +37,7 @@ namespace swift {
3837
class AnyFunctionType;
3938
class ASTExtInfo;
4039
class ASTExtInfoBuilder;
40+
class ClangModuleLoader;
4141
class FunctionType;
4242
class SILExtInfo;
4343
class SILExtInfoBuilder;

include/swift/AST/PropertyWrappers.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ class CustomAttr;
2828
class Expr;
2929
class VarDecl;
3030
class OpaqueValueExpr;
31+
class PropertyWrapperValuePlaceholderExpr;
32+
class SubscriptDecl;
3133

3234
/// The kind of property initializer to look for
3335
enum class PropertyWrapperInitKind {

include/swift/AST/Types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "swift/Basic/UUID.h"
3838
#include "llvm/ADT/ArrayRef.h"
3939
#include "llvm/ADT/DenseMapInfo.h"
40+
#include "llvm/ADT/DenseSet.h"
4041
#include "llvm/ADT/FoldingSet.h"
4142
#include "llvm/ADT/None.h"
4243
#include "llvm/ADT/Optional.h"

include/swift/SIL/TypeLowering.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "swift/SIL/SILValue.h"
2424
#include "llvm/ADT/DenseMap.h"
2525
#include "llvm/ADT/Hashing.h"
26+
#include "llvm/ADT/SetVector.h"
2627
#include "llvm/ADT/SmallVector.h"
2728
#include "llvm/Support/Allocator.h"
2829

include/swift/SILOptimizer/Utils/InstructionDeleter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797

9898
#include "swift/SIL/SILInstruction.h"
9999
#include "swift/SILOptimizer/Utils/InstModCallbacks.h"
100+
#include "llvm/ADT/SetVector.h"
100101

101102
namespace swift {
102103

include/swift/Sema/CSBindings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
namespace swift {
4040

4141
class DeclContext;
42+
enum class KnownProtocolKind : uint8_t;
4243
class ProtocolDecl;
4344

4445
namespace constraints {

0 commit comments

Comments
 (0)