Skip to content

Commit 77fd37b

Browse files
committed
[NFC] SIL: Renamed maySynchronize.
Dropped the NotConsideringSideEffects suffix.
1 parent a00bb27 commit 77fd37b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

SwiftCompilerSources/Sources/Optimizer/Analysis/CalleeAnalysis.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ extension Instruction {
112112
if let site = self as? FullApplySite {
113113
return site.isBarrier(analysis)
114114
}
115-
return maySynchronizeNotConsideringSideEffects
115+
return maySynchronize
116116
}
117117

118118
/// Whether lifetime ends of lexical values may safely be hoisted over this

SwiftCompilerSources/Sources/SIL/Instruction.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ public class Instruction : CustomStringConvertible, Hashable {
119119
return bridged.mayLoadWeakOrUnowned()
120120
}
121121

122-
public final var maySynchronizeNotConsideringSideEffects: Bool {
123-
return bridged.maySynchronizeNotConsideringSideEffects()
122+
public final var maySynchronize: Bool {
123+
return bridged.maySynchronize()
124124
}
125125

126126
public final var mayBeDeinitBarrierNotConsideringSideEffects: Bool {

include/swift/SIL/MemAccessUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ bool mayLoadWeakOrUnowned(SILInstruction* instruction);
247247

248248
/// Conservatively, whether this instruction could involve a synchronization
249249
/// point like a memory barrier, lock or syscall.
250-
bool maySynchronizeNotConsideringSideEffects(SILInstruction* instruction);
250+
bool maySynchronize(SILInstruction* instruction);
251251

252252
/// Conservatively, whether this instruction could be a barrier to hoisting
253253
/// destroys.

include/swift/SIL/SILBridging.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ struct BridgedInstruction {
552552
BRIDGED_INLINE bool maySuspend() const;
553553
bool mayAccessPointer() const;
554554
bool mayLoadWeakOrUnowned() const;
555-
bool maySynchronizeNotConsideringSideEffects() const;
555+
bool maySynchronize() const;
556556
bool mayBeDeinitBarrierNotConsideringSideEffects() const;
557557

558558
// =========================================================================//

lib/SIL/Utils/MemAccessUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ bool swift::mayLoadWeakOrUnowned(SILInstruction *instruction) {
463463

464464
/// Conservatively, whether this instruction could involve a synchronization
465465
/// point like a memory barrier, lock or syscall.
466-
bool swift::maySynchronizeNotConsideringSideEffects(SILInstruction *instruction) {
466+
bool swift::maySynchronize(SILInstruction *instruction) {
467467
return FullApplySite::isa(instruction)
468468
|| isa<EndApplyInst>(instruction)
469469
|| isa<AbortApplyInst>(instruction)
@@ -473,7 +473,7 @@ bool swift::maySynchronizeNotConsideringSideEffects(SILInstruction *instruction)
473473
bool swift::mayBeDeinitBarrierNotConsideringSideEffects(SILInstruction *instruction) {
474474
bool retval = mayAccessPointer(instruction)
475475
|| mayLoadWeakOrUnowned(instruction)
476-
|| maySynchronizeNotConsideringSideEffects(instruction);
476+
|| maySynchronize(instruction);
477477
assert(!retval || !isa<BranchInst>(instruction) && "br as deinit barrier!?");
478478
return retval;
479479
}

lib/SIL/Utils/SILBridging.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,8 @@ bool BridgedInstruction::mayLoadWeakOrUnowned() const {
443443
return ::mayLoadWeakOrUnowned(unbridged());
444444
}
445445

446-
bool BridgedInstruction::maySynchronizeNotConsideringSideEffects() const {
447-
return ::maySynchronizeNotConsideringSideEffects(unbridged());
446+
bool BridgedInstruction::maySynchronize() const {
447+
return ::maySynchronize(unbridged());
448448
}
449449

450450
bool BridgedInstruction::mayBeDeinitBarrierNotConsideringSideEffects() const {

0 commit comments

Comments
 (0)