[MoveChecker] Visit and delete markers in PO.

Visit in post-order in order to resolve markers from the inside out,
required for per-field consume.

Author: nate-chandler

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerTester.cpp

@@ -94,7 +94,8 @@ class MoveOnlyAddressCheckerTesterPass : public SILFunctionTransform {
     llvm::SmallSetVector<MarkUnresolvedNonCopyableValueInst *, 32>
         moveIntroducersToProcess;
     searchForCandidateAddressMarkUnresolvedNonCopyableValueInsts(
-        fn, moveIntroducersToProcess, diagnosticEmitter);
+        fn, getAnalysis<PostOrderAnalysis>(), moveIntroducersToProcess,
+        diagnosticEmitter);
 
     LLVM_DEBUG(llvm::dbgs()
                << "Emitting diagnostic when checking for mark must check inst: "

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.cpp

@@ -479,14 +479,14 @@ static bool isCopyableValue(SILValue value) {
 
 void swift::siloptimizer::
     searchForCandidateAddressMarkUnresolvedNonCopyableValueInsts(
-        SILFunction *fn,
+        SILFunction *fn, PostOrderAnalysis *poa,
         llvm::SmallSetVector<MarkUnresolvedNonCopyableValueInst *, 32>
             &moveIntroducersToProcess,
         DiagnosticEmitter &diagnosticEmitter) {
-  for (auto &block : *fn) {
-    for (auto ii = block.begin(), ie = block.end(); ii != ie;) {
-      auto *mmci = dyn_cast<MarkUnresolvedNonCopyableValueInst>(&*ii);
-      ++ii;
+  auto *po = poa->get(fn);
+  for (auto *block : po->getPostOrder()) {
+    for (auto &ii : llvm::make_range(block->rbegin(), block->rend())) {
+      auto *mmci = dyn_cast<MarkUnresolvedNonCopyableValueInst>(&ii);
 
       if (!mmci || !mmci->hasMoveCheckerKind() || !mmci->getType().isAddress())
         continue;
@@ -3877,6 +3877,9 @@ bool MoveOnlyAddressChecker::check(
       // If we fail the address check in some way, set the diagnose!
       diagnosticEmitter.emitCheckerDoesntUnderstandDiagnostic(markedValue);
     }
+
+    markedValue->replaceAllUsesWith(markedValue->getOperand());
+    markedValue->eraseFromParent();
   }
 
   if (DumpSILBeforeRemovingMarkUnresolvedNonCopyableValueInst) {

lib/SILOptimizer/Mandatory/MoveOnlyAddressCheckerUtils.h

@@ -17,6 +17,8 @@
 
 namespace swift {
 
+class PostOrderAnalysis;
+
 namespace siloptimizer {
 
 class DiagnosticEmitter;
@@ -26,7 +28,7 @@ class DiagnosticEmitter;
 /// NOTE: To see if we emitted a diagnostic, use \p
 /// diagnosticEmitter.getDiagnosticCount().
 void searchForCandidateAddressMarkUnresolvedNonCopyableValueInsts(
-    SILFunction *fn,
+    SILFunction *fn, PostOrderAnalysis *poa,
     llvm::SmallSetVector<MarkUnresolvedNonCopyableValueInst *, 32>
         &moveIntroducersToProcess,
     DiagnosticEmitter &diagnosticEmitter);

lib/SILOptimizer/Mandatory/MoveOnlyChecker.cpp

@@ -186,7 +186,7 @@ void MoveOnlyChecker::checkAddresses() {
   llvm::SmallSetVector<MarkUnresolvedNonCopyableValueInst *, 32>
       moveIntroducersToProcess;
   searchForCandidateAddressMarkUnresolvedNonCopyableValueInsts(
-      fn, moveIntroducersToProcess, diagnosticEmitter);
+      fn, poa, moveIntroducersToProcess, diagnosticEmitter);
 
   LLVM_DEBUG(
       llvm::dbgs()

lib/SILOptimizer/Mandatory/MoveOnlyTempAllocationFromLetTester.cpp

@@ -51,7 +51,8 @@ struct MoveOnlyTempAllocationFromLetTester : SILFunctionTransform {
 
     unsigned diagCount = diagnosticEmitter.getDiagnosticCount();
     searchForCandidateAddressMarkUnresolvedNonCopyableValueInsts(
-        getFunction(), moveIntroducersToProcess, diagnosticEmitter);
+        getFunction(), getAnalysis<PostOrderAnalysis>(),
+        moveIntroducersToProcess, diagnosticEmitter);
 
     // Return early if we emitted a diagnostic.
     if (diagCount != diagnosticEmitter.getDiagnosticCount())

test/Interop/Cxx/operators/move-only/move-only-synthesized-property-typecheck.swift

@@ -30,8 +30,8 @@ func testNonCopyableHolderConstDerefPointee() {
     holder.pointee.mutMethod(1) // expected-error {{cannot use mutating member on immutable value: 'pointee' is a get-only property}}
     holder.pointee.x = 2 // expected-error {{cannot assign to property: 'pointee' is a get-only property}}
 #else
-    consumingNC(holder.pointee) // CHECK: [[@LINE]]:{{.*}}: error:
-    let consumeVal = holder.pointee // CHECK: [[@LINE]]:{{.*}}: error:
+    consumingNC(holder.pointee) // CHECK-DAG: [[@LINE]]:{{.*}}: error:
+    let consumeVal = holder.pointee // CHECK-DAG: [[@LINE]]:{{.*}}: error:
 #endif
 }