averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SILInstruction] Introduce isDebugInstruction().

Browse Source 
This is a property of an instruction and should be a member
function of `SILInstruction` and not a free function in
`DebugUtils`. Discussed with Adrian.
This commit is contained in:
Davide Italiano
2018-04-11 08:29:49 -07:00
parent b36a551550
commit b4d563802b
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/swift/SIL/DebugUtils.h
View File

@@ -43,18 +43,12 @@ namespace swift {
class SILInstruction;
/// Returns true if the instruction \p Inst is an instruction which is only
/// relevant for debug information and has no other impact on program semantics.
inline bool isDebugInst(SILInstruction *Inst) {
return isa<DebugValueInst>(Inst) || isa<DebugValueAddrInst>(Inst);
}
/// Deletes all of the debug instructions that use \p Inst.
inline void deleteAllDebugUses(ValueBase *Inst) {
for (auto UI = Inst->use_begin(), E = Inst->use_end(); UI != E;) {
auto *Inst = UI->getUser();
UI++;
if (isDebugInst(Inst))
if (Inst->isDebugInstruction())
Inst->eraseFromParent();
}
}
@@ -76,7 +70,7 @@ template <bool nonDebugInsts> class DebugUseIterator
return;
SILInstruction *User = BaseIterator->getUser();
if (isDebugInst(User) != nonDebugInsts)
if (User->isDebugInstruction() != nonDebugInsts)
return;
BaseIterator++;
@@ -188,7 +182,7 @@ inline void eraseFromParentWithDebugInsts(SILInstruction *I,
while (!result->use_empty()) {
foundAny = true;
auto *User = result->use_begin()->getUser();
assert(isDebugInst(User));
assert(User->isDebugInstruction());
if (InstIter != SILBasicBlock::iterator() &&
InstIter != I->getParent()->end() &&
&*InstIter == User) {

7
include/swift/SIL/SILInstruction.h
View File

@@ -597,6 +597,13 @@ public:
/// you perform such optimizations like e.g. jump-threading.
bool isTriviallyDuplicatable() const;
/// Returns true if the instruction is only relevant for debug
/// informations and has no other impact on program semantics.
bool isDebugInstruction() const {
return getKind() == SILInstructionKind::DebugValueInst ||
getKind() == SILInstructionKind::DebugValueAddrInst;
}
/// Returns true if the instruction is a meta instruction which is
/// relevant for debug information and does not get lowered to a real
/// instruction.

4
lib/SIL/InstructionUtils.cpp
View File

@@ -275,8 +275,8 @@ bool swift::isEndOfScopeMarker(SILInstruction *user) {
}
bool swift::isIncidentalUse(SILInstruction *user) {
return isEndOfScopeMarker(user) || isDebugInst(user)
|| isa<FixLifetimeInst>(user);
return isEndOfScopeMarker(user) || user->isDebugInstruction() ||
isa<FixLifetimeInst>(user);
}
bool swift::onlyAffectsRefCount(SILInstruction *user) {

8
lib/SILOptimizer/LoopTransforms/COWArrayOpt.cpp
View File

@@ -579,7 +579,7 @@ bool COWArrayOpt::checkSafeArrayAddressUses(UserList &AddressUsers) {
for (auto *UseInst : AddressUsers) {
if (isDebugInst(UseInst))
if (UseInst->isDebugInstruction())
continue;
if (auto *AI = dyn_cast<ApplyInst>(UseInst)) {
@@ -698,7 +698,7 @@ bool COWArrayOpt::checkSafeArrayValueUses(UserList &ArrayValueUsers) {
if (isa<MarkDependenceInst>(UseInst))
continue;
if (isDebugInst(UseInst))
if (UseInst->isDebugInstruction())
continue;
// Found an unsafe or unknown user. The Array may escape here.
@@ -761,7 +761,7 @@ bool COWArrayOpt::checkSafeArrayElementUse(SILInstruction *UseInst,
if (isa<MarkDependenceInst>(UseInst))
return true;
if (isDebugInst(UseInst))
if (UseInst->isDebugInstruction())
return true;
// If this is an instruction which is a safe array element use if and only if
@@ -1764,7 +1764,7 @@ private:
bool checkSafeArrayAddressUses(UserList &AddressUsers) {
for (auto *UseInst : AddressUsers) {
if (isDebugInst(UseInst))
if (UseInst->isDebugInstruction())
continue;
if (isa<DeallocStackInst>(UseInst)) {

8
lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
View File

@@ -934,10 +934,10 @@ static bool isAddressInitializedAtCall(SILValue addr, SILInstruction *AI,
if (!DT->properlyDominates(AI, user))
return false;
} else {
assert(isa<CopyAddrInst>(user) || isa<InitExistentialAddrInst>(user)
|| isa<OpenExistentialAddrInst>(user)
|| isa<DeallocStackInst>(user)
|| isDebugInst(user) && "Unexpected instruction");
assert(isa<CopyAddrInst>(user) || isa<InitExistentialAddrInst>(user) ||
isa<OpenExistentialAddrInst>(user) ||
isa<DeallocStackInst>(user) ||
user->isDebugInstruction() && "Unexpected instruction");
}
}
return true;

6
lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
View File

@@ -415,7 +415,7 @@ SILInstruction *SILCombiner::visitAllocStackInst(AllocStackInst *AS) {
if (auto *OEAI = dyn_cast<OpenExistentialAddrInst>(Op->getUser())) {
for (auto *Op : OEAI->getUses()) {
assert(isa<DestroyAddrInst>(Op->getUser()) ||
isDebugInst(Op->getUser()) && "Unexpected instruction");
Op->getUser()->isDebugInstruction() && "Unexpected instruction");
ToDelete.insert(Op->getUser());
}
}
@@ -425,7 +425,7 @@ SILInstruction *SILCombiner::visitAllocStackInst(AllocStackInst *AS) {
isa<DestroyAddrInst>(Op->getUser()) ||
isa<DeallocStackInst>(Op->getUser()) ||
isa<DeinitExistentialAddrInst>(Op->getUser()) ||
isDebugInst(Op->getUser()) && "Unexpected instruction");
Op->getUser()->isDebugInstruction() && "Unexpected instruction");
ToDelete.insert(Op->getUser());
}
@@ -920,7 +920,7 @@ SILCombiner::visitInjectEnumAddrInst(InjectEnumAddrInst *IEAI) {
// we don't care about the dealloc stack instructions
continue;
}
if (isDebugInst(CurrUser) || isa<LoadInst>(CurrUser)) {
if (CurrUser->isDebugInstruction() || isa<LoadInst>(CurrUser)) {
// These Instructions are a non-risky use we can ignore
continue;
}

4
lib/SILOptimizer/Transforms/ConditionForwarding.cpp
View File

@@ -160,7 +160,7 @@ bool ConditionForwarding::tryOptimize(SwitchEnumInst *SEI) {
if (ArgUser == SEI)
continue;
if (isDebugInst(ArgUser))
if (ArgUser->isDebugInstruction())
continue;
if (ArgUser->getParent()->getSinglePredecessorBlock() == SEI->getParent()) {
@@ -227,7 +227,7 @@ bool ConditionForwarding::tryOptimize(SwitchEnumInst *SEI) {
while (!Arg->use_empty()) {
Operand *ArgUse = *Arg->use_begin();
SILInstruction *ArgUser = ArgUse->getUser();
if (isDebugInst(ArgUser)) {
if (ArgUser->isDebugInstruction()) {
// Don't care about debug instructions. Just remove them.
ArgUser->eraseFromParent();
continue;

2
lib/SILOptimizer/Transforms/SimplifyCFG.cpp
View File

@@ -1127,7 +1127,7 @@ static bool onlyHasTerminatorAndDebugInsts(SILBasicBlock *BB) {
TermInst *Terminator = BB->getTerminator();
SILBasicBlock::iterator Iter = BB->begin();
while (&*Iter != Terminator) {
if (!isDebugInst(&*Iter))
if (!(&*Iter)->isDebugInstruction())
return false;
Iter++;
}

2
lib/SILOptimizer/Utils/Generics.cpp
View File

@@ -2340,7 +2340,7 @@ void swift::trySpecializeApplyOfGeneric(
SILInstruction *User = Use->getUser();
if (isa<RefCountingInst>(User))
continue;
if (isDebugInst(User))
if (User->isDebugInstruction())
continue;
auto FAS = FullApplySite::isa(User);