Skip to content

Commit e926003

Browse files
authored
Merge pull request #77288 from gottesmm/pr-8f042612c02c8c6af6e98fe9488fb6e20e95b92e
[sil] Move mark_unresolved_move_addr in SILNodes.def so it is not classified as a SingleValueInstruction.
2 parents 2f81b70 + 7fd2e46 commit e926003

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

include/swift/SIL/SILNodes.def

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,6 @@ ABSTRACT_VALUE_AND_INST(SingleValueInstruction, ValueBase, SILInstruction)
518518
SINGLE_VALUE_INST(CopyableToMoveOnlyWrapperAddrInst,
519519
copyable_to_moveonlywrapper_addr, SingleValueInstruction,
520520
None, DoesNotRelease)
521-
// A move_addr is a Raw SIL only instruction that is equivalent to a copy_addr
522-
// [init]. It is lowered during the diagnostic passes to a copy_addr [init] if
523-
// the move checker found uses that prevented us from converting this to a
524-
// move or if we do not find such uses, a copy_addr [init] [take].
525-
NON_VALUE_INST(MarkUnresolvedMoveAddrInst, mark_unresolved_move_addr,
526-
SILInstruction, None, DoesNotRelease)
527521

528522
// IsUnique does not actually write to memory but should be modeled
529523
// as such. Its operand is a pointer to an object reference. The
@@ -893,6 +887,13 @@ NON_VALUE_INST(PackElementSetInst, pack_element_set,
893887
NON_VALUE_INST(CondFailInst, cond_fail,
894888
SILInstruction, MayHaveSideEffects, DoesNotRelease)
895889

890+
// A move_addr is a Raw SIL only instruction that is equivalent to a copy_addr
891+
// [init]. It is lowered during the diagnostic passes to a copy_addr [init] if
892+
// the move checker found uses that prevented us from converting this to a
893+
// move or if we do not find such uses, a copy_addr [init] [take].
894+
NON_VALUE_INST(MarkUnresolvedMoveAddrInst, mark_unresolved_move_addr,
895+
SILInstruction, None, DoesNotRelease)
896+
896897
NON_VALUE_INST(IncrementProfilerCounterInst, increment_profiler_counter,
897898
SILInstruction, MayReadWrite, DoesNotRelease)
898899

0 commit comments

Comments
 (0)