Skip to content

Commit c7a4637

Browse files
committed
[AliasAnalysis] Rename getMemoryBehavior.
getMemoryBehavior is also used by SILInstruction. This commit renames getMemoryBehavior to computeMemoryBehavior and cleans some of the code that touches it. // I forgot to add this file in my previous commit.
1 parent 96ab8d8 commit c7a4637

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

Diff for: include/swift/SILAnalysis/AliasAnalysis.h

+15-18
Original file line numberDiff line numberDiff line change
@@ -110,51 +110,48 @@ class AliasAnalysis : public SILAnalysis {
110110
///
111111
/// TODO: When ref count behavior is separated from generic memory behavior,
112112
/// the IgnoreRefCountIncrements flag will be unnecessary.
113-
MemoryBehavior getMemoryBehavior(SILInstruction *Inst, SILValue V,
114-
RetainObserveKind);
113+
MemoryBehavior computeMemoryBehavior(SILInstruction *Inst, SILValue V,
114+
RetainObserveKind);
115115

116116
/// Returns true if \p Inst may read from memory in a manner that
117117
/// affects V.
118118
bool mayReadFromMemory(SILInstruction *Inst, SILValue V) {
119-
MemoryBehavior B = getMemoryBehavior(Inst, V,
120-
RetainObserveKind::IgnoreRetains);
119+
auto B = computeMemoryBehavior(Inst, V, RetainObserveKind::IgnoreRetains);
121120
return B == MemoryBehavior::MayRead ||
122-
B == MemoryBehavior::MayReadWrite ||
123-
B == MemoryBehavior::MayHaveSideEffects;
121+
B == MemoryBehavior::MayReadWrite ||
122+
B == MemoryBehavior::MayHaveSideEffects;
124123
}
125124

126125
/// Returns true if \p Inst may write to memory in a manner that
127126
/// affects V.
128127
bool mayWriteToMemory(SILInstruction *Inst, SILValue V) {
129-
MemoryBehavior B = getMemoryBehavior(Inst, V,
130-
RetainObserveKind::IgnoreRetains);
128+
auto B = computeMemoryBehavior(Inst, V, RetainObserveKind::IgnoreRetains);
131129
return B == MemoryBehavior::MayWrite ||
132-
B == MemoryBehavior::MayReadWrite ||
133-
B == MemoryBehavior::MayHaveSideEffects;
130+
B == MemoryBehavior::MayReadWrite ||
131+
B == MemoryBehavior::MayHaveSideEffects;
134132
}
135133

136134
/// Returns true if \p Inst may read or write to memory in a manner that
137135
/// affects V.
138136
bool mayReadOrWriteMemory(SILInstruction *Inst, SILValue V) {
139-
auto B = getMemoryBehavior(Inst, V, RetainObserveKind::IgnoreRetains);
140-
return B != MemoryBehavior::None;
137+
auto B = computeMemoryBehavior(Inst, V, RetainObserveKind::IgnoreRetains);
138+
return MemoryBehavior::None != B;
141139
}
142140

143141
/// Returns true if Inst may have side effects in a manner that affects V.
144142
bool mayHaveSideEffects(SILInstruction *Inst, SILValue V) {
145-
MemoryBehavior B = getMemoryBehavior(Inst, V,
146-
RetainObserveKind::ObserveRetains);
143+
auto B = computeMemoryBehavior(Inst, V, RetainObserveKind::ObserveRetains);
147144
return B == MemoryBehavior::MayWrite ||
148-
B == MemoryBehavior::MayReadWrite ||
149-
B == MemoryBehavior::MayHaveSideEffects;
145+
B == MemoryBehavior::MayReadWrite ||
146+
B == MemoryBehavior::MayHaveSideEffects;
150147
}
151148

152149
/// Returns true if Inst may have side effects in a manner that affects
153150
/// V. This is independent of whether or not Inst may write to V and is meant
154151
/// to encode notions such as ref count modifications.
155152
bool mayHavePureSideEffects(SILInstruction *Inst, SILValue V) {
156-
return getMemoryBehavior(Inst, V, RetainObserveKind::ObserveRetains) ==
157-
MemoryBehavior::MayHaveSideEffects;
153+
auto B = computeMemoryBehavior(Inst, V, RetainObserveKind::ObserveRetains);
154+
return MemoryBehavior::MayHaveSideEffects == B;
158155
}
159156

160157
virtual void invalidate(SILAnalysis::InvalidationKind K) { AliasCache.clear(); }

0 commit comments

Comments
 (0)