Skip to content

Commit 84450b4

Browse files
atrickatrick
committed
Reorganize SILOptimizer directories for better discoverability.
(Headers first) It has been generally agreed that we need to do this reorg, and now seems like the perfect time. Some major pass reorganization is in the works. This does not have to be the final word on the matter. The consensus among those working on the code is that it's much better than what we had and a better starting point for future bike shedding. Note that the previous organization was designed to allow separate analysis and optimization libraries. It turns out this is an artificial distinction and not an important goal.
1 parent 689db17 commit 84450b4

File tree

159 files changed

+561
-561
lines changed

Some content is hidden

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

159 files changed

+561
-561
lines changed

‎include/swift/SIL/MemLocation.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#ifndef SWIFT_SIL_MEMLOCATION_H
2020
#define SWIFT_SIL_MEMLOCATION_H
2121

22-
#include "swift/SILAnalysis/AliasAnalysis.h"
23-
#include "swift/SILAnalysis/TypeExpansionAnalysis.h"
22+
#include "swift/SILOptimizer/Analysis/AliasAnalysis.h"
23+
#include "swift/SILOptimizer/Analysis/TypeExpansionAnalysis.h"
2424
#include "swift/SIL/Projection.h"
25-
#include "swift/SILPasses/Utils/Local.h"
26-
#include "swift/SILAnalysis/ValueTracking.h"
25+
#include "swift/SILOptimizer/Utils/Local.h"
26+
#include "swift/SILOptimizer/Analysis/ValueTracking.h"
2727
#include "llvm/ADT/DenseMap.h"
2828
#include "llvm/ADT/DenseSet.h"
2929
#include "llvm/ADT/Hashing.h"

‎include/swift/SIL/TypeSubstCloner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "swift/AST/Type.h"
2222
#include "swift/SIL/SILCloner.h"
2323
#include "swift/SIL/DynamicCasts.h"
24-
#include "swift/SILPasses/Utils/Local.h"
24+
#include "swift/SILOptimizer/Utils/Local.h"
2525
#include "llvm/Support/Debug.h"
2626

2727
namespace swift {

‎include/swift/SILAnalysis/ARCAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/ARCAnalysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_ARCANALYSIS_H
14-
#define SWIFT_SILANALYSIS_ARCANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_ARCANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_ARCANALYSIS_H
1515

1616
#include "swift/SIL/SILArgument.h"
1717
#include "swift/SIL/SILValue.h"

‎include/swift/SILAnalysis/AliasAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/AliasAnalysis.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_ALIASANALYSIS_H
14-
#define SWIFT_SILANALYSIS_ALIASANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_ALIASANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_ALIASANALYSIS_H
1515

1616
#include "swift/Basic/ValueEnumerator.h"
1717
#include "swift/SIL/SILInstruction.h"
18-
#include "swift/SILAnalysis/Analysis.h"
19-
#include "swift/SILAnalysis/SideEffectAnalysis.h"
18+
#include "swift/SILOptimizer/Analysis/Analysis.h"
19+
#include "swift/SILOptimizer/Analysis/SideEffectAnalysis.h"
2020
#include "llvm/ADT/DenseMap.h"
2121

2222
using swift::RetainObserveKind;

‎include/swift/SILAnalysis/Analysis.def renamed to ‎include/swift/SILOptimizer/Analysis/Analysis.def

File renamed without changes.

‎include/swift/SILAnalysis/Analysis.h renamed to ‎include/swift/SILOptimizer/Analysis/Analysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "swift/SIL/Notifications.h"
1919
#include <vector>
2020

21-
#ifndef SWIFT_SILANALYSIS_ANALYSIS_H
22-
#define SWIFT_SILANALYSIS_ANALYSIS_H
21+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_ANALYSIS_H
22+
#define SWIFT_SILOPTIMIZER_ANALYSIS_ANALYSIS_H
2323

2424
namespace swift {
2525
class SILModule;

‎include/swift/SILAnalysis/ArraySemantic.h renamed to ‎include/swift/SILOptimizer/Analysis/ArraySemantic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_ARRAYSEMANTIC_H
14-
#define SWIFT_SILANALYSIS_ARRAYSEMANTIC_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_ARRAYSEMANTIC_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_ARRAYSEMANTIC_H
1515

1616
#include "swift/SIL/SILInstruction.h"
1717

‎include/swift/SILAnalysis/BasicCalleeAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_BASICCALLEEANALYSIS_H
14-
#define SWIFT_SILANALYSIS_BASICCALLEEANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_BASICCALLEEANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_BASICCALLEEANALYSIS_H
1515

16-
#include "swift/SILAnalysis/Analysis.h"
16+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1717
#include "swift/SIL/SILFunction.h"
1818
#include "swift/SIL/SILInstruction.h"
1919
#include "swift/SIL/SILModule.h"

‎include/swift/SILAnalysis/BottomUpIPAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/BottomUpIPAnalysis.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef SWIFT_SILANALYSIS_BOTTOMUPIPANALYSIS_H
18-
#define SWIFT_SILANALYSIS_BOTTOMUPIPANALYSIS_H
17+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_BOTTOMUPIPANALYSIS_H
18+
#define SWIFT_SILOPTIMIZER_ANALYSIS_BOTTOMUPIPANALYSIS_H
1919

20-
#include "swift/SILAnalysis/Analysis.h"
20+
#include "swift/SILOptimizer/Analysis/Analysis.h"
2121
#include "swift/SIL/SILInstruction.h"
2222
#include "llvm/ADT/SmallVector.h"
2323

@@ -310,4 +310,4 @@ class BottomUpIPAnalysis : public SILAnalysis {
310310

311311
} // end namespace swift
312312

313-
#endif // SWIFT_SILANALYSIS_BOTTOMUPIPANALYSIS_H
313+
#endif // SWIFT_SILOPTIMIZER_ANALYSIS_BOTTOMUPIPANALYSIS_H

‎include/swift/SILAnalysis/CFG.h renamed to ‎include/swift/SILOptimizer/Analysis/CFG.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_CFG_H
14-
#define SWIFT_SILANALYSIS_CFG_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_CFG_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_CFG_H
1515

1616
namespace llvm {
1717

‎include/swift/SILAnalysis/ClassHierarchyAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/ClassHierarchyAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_CLASSHIERARCHY_H
14-
#define SWIFT_SILANALYSIS_CLASSHIERARCHY_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_CLASSHIERARCHY_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_CLASSHIERARCHY_H
1515

16-
#include "swift/SILAnalysis/Analysis.h"
16+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1717
#include "swift/SIL/SILArgument.h"
1818
#include "swift/SIL/SILValue.h"
1919
#include "llvm/ADT/SmallVector.h"

‎include/swift/SILAnalysis/ColdBlockInfo.h renamed to ‎include/swift/SILOptimizer/Analysis/ColdBlockInfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_COLDBLOCKS_H
14-
#define SWIFT_SILANALYSIS_COLDBLOCKS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_COLDBLOCKS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_COLDBLOCKS_H
1515

1616
#include "llvm/ADT/DenseMap.h"
1717

‎include/swift/SILAnalysis/DestructorAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/DestructorAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
#ifndef SWIFT_SILANALYSIS_DESTRUCTORANALYSIS_H
13-
#define SWIFT_SILANALYSIS_DESTRUCTORANALYSIS_H
12+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_DESTRUCTORANALYSIS_H
13+
#define SWIFT_SILOPTIMIZER_ANALYSIS_DESTRUCTORANALYSIS_H
1414

1515
#include "swift/SIL/SILValue.h"
16-
#include "swift/SILAnalysis/Analysis.h"
16+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1717
#include "llvm/ADT/DenseMap.h"
1818

1919
namespace swift {

‎include/swift/SILAnalysis/DominanceAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/DominanceAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_DOMINANCEANALYSIS_H
14-
#define SWIFT_SILANALYSIS_DOMINANCEANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_DOMINANCEANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_DOMINANCEANALYSIS_H
1515

1616
#include "swift/SIL/SILInstruction.h"
1717
#include "swift/SIL/Dominance.h"
18-
#include "swift/SILAnalysis/Analysis.h"
18+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1919
#include "llvm/ADT/DenseMap.h"
2020

2121
namespace swift {

‎include/swift/SILAnalysis/EscapeAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/EscapeAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_ESCAPEANALYSIS_H_
14-
#define SWIFT_SILANALYSIS_ESCAPEANALYSIS_H_
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_ESCAPEANALYSIS_H_
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_ESCAPEANALYSIS_H_
1515

1616
#include "swift/SIL/SILInstruction.h"
1717
#include "swift/SIL/SILFunction.h"
18-
#include "swift/SILAnalysis/BottomUpIPAnalysis.h"
18+
#include "swift/SILOptimizer/Analysis/BottomUpIPAnalysis.h"
1919
#include "llvm/ADT/DenseMap.h"
2020
#include "llvm/ADT/SetVector.h"
2121
#include "llvm/ADT/SmallVector.h"

‎include/swift/SILAnalysis/FunctionOrder.h renamed to ‎include/swift/SILOptimizer/Analysis/FunctionOrder.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_FUNCTIONORDER_H
14-
#define SWIFT_SILANALYSIS_FUNCTIONORDER_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_FUNCTIONORDER_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_FUNCTIONORDER_H
1515

16-
#include "swift/SILAnalysis/BasicCalleeAnalysis.h"
16+
#include "swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h"
1717
#include "llvm/ADT/ArrayRef.h"
1818
#include "llvm/ADT/DenseMap.h"
1919
#include "llvm/ADT/SetVector.h"

‎include/swift/SILAnalysis/IVAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/IVAnalysis.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_IVANALYSIS_H
14-
#define SWIFT_SILANALYSIS_IVANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_IVANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_IVANALYSIS_H
1515

16-
#include "swift/SILAnalysis/Analysis.h"
16+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1717
#include "swift/SIL/SILArgument.h"
1818
#include "swift/SIL/SILValue.h"
19-
#include "swift/SILPasses/Utils/SCCVisitor.h"
19+
#include "swift/SILOptimizer/Utils/SCCVisitor.h"
2020
#include "llvm/ADT/DenseMap.h"
2121
#include "llvm/ADT/SmallVector.h"
2222
#include "llvm/Support/Debug.h"

‎include/swift/SILAnalysis/LoopAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/LoopAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_LOOPINFOANALYSIS_H
14-
#define SWIFT_SILANALYSIS_LOOPINFOANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_LOOPINFOANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_LOOPINFOANALYSIS_H
1515

1616
#include "swift/SIL/CFG.h"
1717
#include "swift/SIL/LoopInfo.h"
1818
#include "swift/SIL/SILBasicBlock.h"
19-
#include "swift/SILAnalysis/Analysis.h"
19+
#include "swift/SILOptimizer/Analysis/Analysis.h"
2020
#include "llvm/ADT/DenseMap.h"
2121

2222
namespace swift {

‎include/swift/SILAnalysis/LoopRegionAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/LoopRegionAnalysis.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@
113113
///
114114
//===----------------------------------------------------------------------===//
115115

116-
#ifndef SWIFT_SILANALYSIS_LOOPNESTANALYSIS_H
117-
#define SWIFT_SILANALYSIS_LOOPNESTANALYSIS_H
116+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_LOOPNESTANALYSIS_H
117+
#define SWIFT_SILOPTIMIZER_ANALYSIS_LOOPNESTANALYSIS_H
118118

119-
#include "swift/SILAnalysis/Analysis.h"
119+
#include "swift/SILOptimizer/Analysis/Analysis.h"
120120
#include "swift/Basic/BlotSetVector.h"
121121
#include "swift/Basic/Range.h"
122122
#include "swift/Basic/STLExtras.h"
123-
#include "swift/SILAnalysis/PostOrderAnalysis.h"
124-
#include "swift/SILAnalysis/LoopAnalysis.h"
125-
#include "swift/SILPasses/PassManager.h"
123+
#include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
124+
#include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
125+
#include "swift/SILOptimizer/PassManager/PassManager.h"
126126
#include "swift/SIL/LoopInfo.h"
127127
#include "swift/SIL/SILBasicBlock.h"
128128
#include "swift/SIL/SILFunction.h"

‎include/swift/SILAnalysis/PostOrderAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/PostOrderAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_POSTORDERANALYSIS_H
14-
#define SWIFT_SILANALYSIS_POSTORDERANALYSIS_H
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_POSTORDERANALYSIS_H
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_POSTORDERANALYSIS_H
1515

16-
#include "swift/SILAnalysis/Analysis.h"
16+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1717
#include "swift/Basic/Range.h"
1818
#include "swift/SIL/CFG.h"
1919
#include "swift/SIL/SILBasicBlock.h"

‎include/swift/SILAnalysis/RCIdentityAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/RCIdentityAnalysis.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
//
1717
//===----------------------------------------------------------------------===//
1818

19-
#ifndef SWIFT_SILANALYSIS_RCIDENTITYANALYSIS_H
20-
#define SWIFT_SILANALYSIS_RCIDENTITYANALYSIS_H
19+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_RCIDENTITYANALYSIS_H
20+
#define SWIFT_SILOPTIMIZER_ANALYSIS_RCIDENTITYANALYSIS_H
2121

2222
#include "swift/SIL/SILValue.h"
2323
#include "swift/SIL/SILArgument.h"
24-
#include "swift/SILAnalysis/Analysis.h"
25-
#include "swift/SILAnalysis/DominanceAnalysis.h"
26-
#include "swift/SILPasses/PassManager.h"
24+
#include "swift/SILOptimizer/Analysis/Analysis.h"
25+
#include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
26+
#include "swift/SILOptimizer/PassManager/PassManager.h"
2727

2828
namespace swift {
2929

‎include/swift/SILAnalysis/SideEffectAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/SideEffectAnalysis.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILANALYSIS_SIDEEFFECTANALYSIS_H_
14-
#define SWIFT_SILANALYSIS_SIDEEFFECTANALYSIS_H_
13+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_SIDEEFFECTANALYSIS_H_
14+
#define SWIFT_SILOPTIMIZER_ANALYSIS_SIDEEFFECTANALYSIS_H_
1515

1616
#include "swift/SIL/SILInstruction.h"
1717
#include "swift/SIL/SILFunction.h"
18-
#include "swift/SILAnalysis/BottomUpIPAnalysis.h"
19-
#include "swift/SILAnalysis/ArraySemantic.h"
18+
#include "swift/SILOptimizer/Analysis/BottomUpIPAnalysis.h"
19+
#include "swift/SILOptimizer/Analysis/ArraySemantic.h"
2020
#include "llvm/ADT/DenseMap.h"
2121
#include "llvm/ADT/SetVector.h"
2222
#include "llvm/ADT/SmallVector.h"

‎include/swift/SILAnalysis/SimplifyInstruction.h renamed to ‎include/swift/SILOptimizer/Analysis/SimplifyInstruction.h

File renamed without changes.

‎include/swift/SILAnalysis/TypeExpansionAnalysis.h renamed to ‎include/swift/SILOptimizer/Analysis/TypeExpansionAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
#ifndef SWIFT_SILANALYSIS_TYPEEXPANSIONANALYSIS_H
13-
#define SWIFT_SILANALYSIS_TYPEEXPANSIONANALYSIS_H
12+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_TYPEEXPANSIONANALYSIS_H
13+
#define SWIFT_SILOPTIMIZER_ANALYSIS_TYPEEXPANSIONANALYSIS_H
1414

1515
#include "swift/SIL/Projection.h"
1616
#include "swift/SIL/SILType.h"
1717
#include "swift/SIL/SILValue.h"
18-
#include "swift/SILAnalysis/Analysis.h"
18+
#include "swift/SILOptimizer/Analysis/Analysis.h"
1919
#include "llvm/ADT/DenseMap.h"
2020

2121
namespace swift {

‎include/swift/SILAnalysis/ValueTracking.h renamed to ‎include/swift/SILOptimizer/Analysis/ValueTracking.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef SWIFT_SILANALYSIS_VALUETRACKING_H
18-
#define SWIFT_SILANALYSIS_VALUETRACKING_H
17+
#ifndef SWIFT_SILOPTIMIZER_ANALYSIS_VALUETRACKING_H
18+
#define SWIFT_SILOPTIMIZER_ANALYSIS_VALUETRACKING_H
1919

2020
#include "swift/SIL/SILInstruction.h"
2121

@@ -59,4 +59,4 @@ bool canOverflow(BuiltinInst *BI);
5959

6060
} // end namespace swift
6161

62-
#endif // SWIFT_SILANALYSIS_VALUETRACKING_H
62+
#endif // SWIFT_SILOPTIMIZER_ANALYSIS_VALUETRACKING_H

‎include/swift/SILPasses/PassManager.h renamed to ‎include/swift/SILOptimizer/PassManager/PassManager.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "swift/SILAnalysis/Analysis.h"
14-
#include "swift/SILPasses/Passes.h"
13+
#include "swift/SILOptimizer/Analysis/Analysis.h"
14+
#include "swift/SILOptimizer/PassManager/Passes.h"
1515
#include "llvm/Support/Casting.h"
1616
#include "llvm/ADT/ArrayRef.h"
1717
#include "llvm/ADT/DenseMap.h"
1818
#include "llvm/ADT/SmallVector.h"
1919
#include "llvm/Support/ErrorHandling.h"
2020

21-
#ifndef SWIFT_SILPASSES_PASSMANAGER_H
22-
#define SWIFT_SILPASSES_PASSMANAGER_H
21+
#ifndef SWIFT_SILOPTIMIZER_PASSMANAGER_PASSMANAGER_H
22+
#define SWIFT_SILOPTIMIZER_PASSMANAGER_PASSMANAGER_H
2323

2424
namespace swift {
2525

‎include/swift/SILPasses/Passes.def renamed to ‎include/swift/SILOptimizer/PassManager/Passes.def

File renamed without changes.

‎include/swift/SILPasses/Passes.h renamed to ‎include/swift/SILOptimizer/PassManager/Passes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef SWIFT_SILPASSES_PASSES_H
18-
#define SWIFT_SILPASSES_PASSES_H
17+
#ifndef SWIFT_SILOPTIMIZER_PASSMANAGER_PASSES_H
18+
#define SWIFT_SILOPTIMIZER_PASSMANAGER_PASSES_H
1919

2020
#include "swift/SIL/SILModule.h"
2121

‎include/swift/SILPasses/PrettyStackTrace.h renamed to ‎include/swift/SILOptimizer/PassManager/PrettyStackTrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef SWIFT_SILPASSES_PRETTYSTACKTRACE_H
14-
#define SWIFT_SILPASSES_PRETTYSTACKTRACE_H
13+
#ifndef SWIFT_SILOPTIMIZER_PASSMANAGER_PRETTYSTACKTRACE_H
14+
#define SWIFT_SILOPTIMIZER_PASSMANAGER_PRETTYSTACKTRACE_H
1515

1616
#include "llvm/Support/PrettyStackTrace.h"
1717

0 commit comments

Comments
 (0)