Skip to content

Commit 234fcc1

Browse files
committed
[pass-manager] notifyDeleteFunction => notifyWillDeleteFunction.
This name makes it clear that the function has not yet been deleted and also contrasts with the past tense used in the API notifyAddedOrModifiedFunction to show that said function has already added/modified the function.
1 parent 1fa1154 commit 234fcc1

15 files changed

+21
-21
lines changed

include/swift/SILOptimizer/Analysis/AccessSummaryAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class AccessSummaryAnalysis : public BottomUpIPAnalysis {
199199
virtual void invalidate() override;
200200
virtual void invalidate(SILFunction *F, InvalidationKind K) override;
201201
virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
202-
virtual void notifyDeleteFunction(SILFunction *F) override {
202+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
203203
invalidate(F, InvalidationKind::Nothing);
204204
}
205205
virtual void invalidateFunctionTables() override {}

include/swift/SILOptimizer/Analysis/AliasAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ class AliasAnalysis : public SILAnalysis {
285285

286286
/// Notify the analysis about a function which will be deleted from the
287287
/// module.
288-
virtual void notifyDeleteFunction(SILFunction *F) override { }
288+
virtual void notifyWillDeleteFunction(SILFunction *F) override {}
289289

290290
virtual void invalidateFunctionTables() override { }
291291
};

include/swift/SILOptimizer/Analysis/Analysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ class SILAnalysis : public DeleteNotificationHandler {
119119
/// Notify the analysis about a newly added or modified function.
120120
virtual void notifyAddedOrModifiedFunction(SILFunction *f) = 0;
121121

122-
/// Notify the analysis about a function which will be deleted from the
122+
/// Notify the analysis about a function that will be deleted from the
123123
/// module.
124-
virtual void notifyDeleteFunction(SILFunction *f) = 0;
124+
virtual void notifyWillDeleteFunction(SILFunction *f) = 0;
125125

126126
/// Notify the analysis about changed witness or vtables.
127127
virtual void invalidateFunctionTables() = 0;
@@ -248,7 +248,7 @@ class FunctionAnalysisBase : public SILAnalysis {
248248

249249
/// Notify the analysis about a function which will be deleted from the
250250
/// module.
251-
virtual void notifyDeleteFunction(SILFunction *f) override {
251+
virtual void notifyWillDeleteFunction(SILFunction *f) override {
252252
invalidateFunction(f);
253253
}
254254

include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ class BasicCalleeAnalysis : public SILAnalysis {
151151

152152
/// Notify the analysis about a function which will be deleted from the
153153
/// module.
154-
virtual void notifyDeleteFunction(SILFunction *F) override {
155-
// No invalidation needed because the analysis does not cache anything
156-
// per call-site in functions.
157-
};
154+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
155+
// No invalidation needed because the analysis does not cache anything per
156+
// call-site in functions.
157+
}
158158

159159
/// Notify the analysis about changed witness or vtables.
160160
virtual void invalidateFunctionTables() override {

include/swift/SILOptimizer/Analysis/CallerAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class CallerAnalysis : public SILAnalysis {
111111

112112
/// Notify the analysis about a function which will be deleted from the
113113
/// module.
114-
virtual void notifyDeleteFunction(SILFunction *F) override {
114+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
115115
invalidateExistingCalleeRelation(F);
116116
RecomputeFunctionList.remove(F);
117117
}

include/swift/SILOptimizer/Analysis/ClassHierarchyAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ClassHierarchyAnalysis : public SILAnalysis {
5858

5959
/// Notify the analysis about a function which will be deleted from the
6060
/// module.
61-
virtual void notifyDeleteFunction(SILFunction *F) override { }
61+
virtual void notifyWillDeleteFunction(SILFunction *F) override {}
6262

6363
/// Notify the analysis about changed witness or vtables.
6464
virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/Analysis/ClosureScope.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ClosureScopeAnalysis : public SILAnalysis {
151151

152152
/// Notify the analysis about a function which will be deleted from the
153153
/// module.
154-
virtual void notifyDeleteFunction(SILFunction *F) override;
154+
virtual void notifyWillDeleteFunction(SILFunction *F) override;
155155

156156
/// Notify the analysis about changed witness or vtables.
157157
virtual void invalidateFunctionTables() override {

include/swift/SILOptimizer/Analysis/DestructorAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class DestructorAnalysis : public SILAnalysis {
5050

5151
/// Notify the analysis about a function which will be deleted from the
5252
/// module.
53-
virtual void notifyDeleteFunction(SILFunction *F) override { }
53+
virtual void notifyWillDeleteFunction(SILFunction *F) override {}
5454

5555
/// Notify the analysis about changed witness or vtables.
5656
virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/Analysis/EscapeAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
806806

807807
/// Notify the analysis about a function which will be deleted from the
808808
/// module.
809-
virtual void notifyDeleteFunction(SILFunction *F) override {
809+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
810810
invalidate(F, InvalidationKind::Nothing);
811811
}
812812

include/swift/SILOptimizer/Analysis/ProtocolConformanceAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ProtocolConformanceAnalysis : public SILAnalysis {
5858

5959
/// Notify the analysis about a function which will be deleted from the
6060
/// module.
61-
virtual void notifyDeleteFunction(SILFunction *F) override {}
61+
virtual void notifyWillDeleteFunction(SILFunction *F) override {}
6262

6363
/// Notify the analysis about changed witness or vtables.
6464
virtual void invalidateFunctionTables() override {}

include/swift/SILOptimizer/Analysis/SideEffectAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class GenericFunctionEffectAnalysis : public BottomUpIPAnalysis {
127127

128128
/// Notify the analysis about a function which will be deleted from the
129129
/// module.
130-
virtual void notifyDeleteFunction(SILFunction *F) override {
130+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
131131
invalidate(F, InvalidationKind::Nothing);
132132
}
133133

include/swift/SILOptimizer/Analysis/TypeExpansionAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class TypeExpansionAnalysis : public SILAnalysis {
4848

4949
/// Notify the analysis about a function which will be deleted from the
5050
/// module.
51-
virtual void notifyDeleteFunction(SILFunction *F) override { }
51+
virtual void notifyWillDeleteFunction(SILFunction *F) override {}
5252

5353
/// Notify the analysis about changed witness or vtables.
5454
virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/PassManager/PassManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ class SILPassManager {
207207
// Invalidate the analysis (unless they are locked)
208208
for (auto AP : Analysis)
209209
if (!AP->isLocked())
210-
AP->notifyDeleteFunction(F);
211-
210+
AP->notifyWillDeleteFunction(F);
211+
212212
CurrentPassHasInvalidated = true;
213213
// Any change let all passes run again.
214214
CompletedPassesMap[F].reset();

lib/SILOptimizer/Analysis/ClosureScope.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void ClosureScopeAnalysis::invalidate() {
150150
if (scopeData) scopeData->reset();
151151
}
152152

153-
void ClosureScopeAnalysis::notifyDeleteFunction(SILFunction *F) {
153+
void ClosureScopeAnalysis::notifyWillDeleteFunction(SILFunction *F) {
154154
if (scopeData) scopeData->erase(F);
155155
}
156156

lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ class OptimizerStatsAnalysis : public SILAnalysis {
498498

499499
/// Notify the analysis about a function which will be deleted from the
500500
/// module.
501-
virtual void notifyDeleteFunction(SILFunction *F) override {
501+
virtual void notifyWillDeleteFunction(SILFunction *F) override {
502502
DeletedFuncs.push_back(F);
503503
};
504504

0 commit comments

Comments
 (0)