Skip to content

Commit 48ed191

Browse files
committed
Revert "Moves SignatureAnalyzer and ArgumentDescriptor/ResultDescriptor into a separate"
This reverts commit 069612b. Reverts because it Breaks compiling the stdlib (optimized, no stdlib assertions), while i try to reproduce and fix.
1 parent 4bc02d6 commit 48ed191

File tree

7 files changed

+533
-659
lines changed

7 files changed

+533
-659
lines changed

include/swift/SIL/Projection.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,6 @@ class ProjectionTree {
832832
ProjectionTree(SILModule &Mod, llvm::BumpPtrAllocator &Allocator,
833833
SILType BaseTy, ProjectionTreeNode::LivenessKind Kind,
834834
llvm::DenseSet<SILInstruction*> Insts);
835-
/// Construct an uninitialized projection tree, which can then be
836-
/// initialized by initializeWithExistingTree.
837-
ProjectionTree(SILModule &Mod, llvm::BumpPtrAllocator &Allocator)
838-
: Mod(Mod), Allocator(Allocator) {}
839835
~ProjectionTree();
840836
ProjectionTree(const ProjectionTree &) = delete;
841837
ProjectionTree(ProjectionTree &&) = default;
@@ -846,10 +842,6 @@ class ProjectionTree {
846842
/// All debug instructions (debug_value, debug_value_addr) are ignored.
847843
void computeUsesAndLiveness(SILValue Base);
848844

849-
/// Initialize an empty projection tree with an existing, computed projection
850-
/// tree.
851-
void initializeWithExistingTree(const ProjectionTree &PT);
852-
853845
/// Create a root SILValue iout of the given leaf node values by walking on
854846
/// the projection tree.
855847
SILValue computeExplodedArgumentValue(SILBuilder &Builder,

include/swift/SILOptimizer/Analysis/Analysis.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ ANALYSIS(ClassHierarchy)
2929
ANALYSIS(Destructor)
3030
ANALYSIS(Dominance)
3131
ANALYSIS(Escape)
32-
ANALYSIS(FunctionSignature)
3332
ANALYSIS(InductionVariable)
3433
ANALYSIS(Loop)
3534
ANALYSIS(LoopRegion)

include/swift/SILOptimizer/Analysis/FunctionSignatureAnalysis.h

Lines changed: 0 additions & 264 deletions
This file was deleted.

lib/SIL/Projection.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,16 +1172,6 @@ ProjectionTree::~ProjectionTree() {
11721172
N->~ProjectionTreeNode();
11731173
}
11741174

1175-
void
1176-
ProjectionTree::initializeWithExistingTree(const ProjectionTree &PT) {
1177-
Kind = PT.Kind;
1178-
EpilogueReleases = PT.EpilogueReleases;
1179-
LiveLeafIndices = PT.LiveLeafIndices;
1180-
for (const auto &N : PT.ProjectionTreeNodes) {
1181-
ProjectionTreeNodes.push_back(new (Allocator) ProjectionTreeNode(*N));
1182-
}
1183-
}
1184-
11851175
SILValue
11861176
ProjectionTree::computeExplodedArgumentValueInner(SILBuilder &Builder,
11871177
SILLocation Loc,

lib/SILOptimizer/Analysis/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ set(ANALYSIS_SOURCES
1010
Analysis/DestructorAnalysis.cpp
1111
Analysis/EscapeAnalysis.cpp
1212
Analysis/FunctionOrder.cpp
13-
Analysis/FunctionSignatureAnalysis.cpp
1413
Analysis/IVAnalysis.cpp
1514
Analysis/LoopAnalysis.cpp
1615
Analysis/LoopRegionAnalysis.cpp

0 commit comments

Comments
 (0)