[move-function] Disable move checking of guaranteed object parameters to match move checking of address only parameters.

Author: gottesmm

lib/SILOptimizer/Mandatory/MoveKillsCopyableValuesChecker.cpp

@@ -335,8 +335,7 @@ bool MoveKillsCopyableValuesChecker::check() {
   SmallSetVector<SILValue, 32> valuesToCheck;
 
   for (auto *arg : fn->getEntryBlock()->getSILFunctionArguments()) {
-    if (arg->getOwnershipKind() == OwnershipKind::Guaranteed ||
-        arg->getOwnershipKind() == OwnershipKind::Owned)
+    if (arg->getOwnershipKind() == OwnershipKind::Owned)
       valuesToCheck.insert(arg);
   }
 

test/SILOptimizer/move_function_kills_copyable_values.swift

@@ -22,7 +22,7 @@ func nonConsumingUse(_ k: Klass) {}
 // Let + Non Consuming Use
 //
 
-public func simpleLinearUse(_ x: Klass) {
+public func simpleLinearUse(_ x: __owned Klass) {
     let y = x // expected-error {{'y' used after being moved}}
     let _ = _move(y) // expected-note {{move here}}
     nonConsumingUse(y) // expected-note {{use here}}
@@ -110,24 +110,23 @@ public func conditionalBadConsumingUseLoop(_ x: Klass) {
 //===
 // Parameters
 
-// This is ok, no uses after.
-public func simpleMoveOfParameter(_ x: Klass) -> () {
+public func simpleMoveOfParameter(_ x: __owned Klass) -> () {
     let _ = _move(x)
 }
 
-public func errorSimpleMoveOfParameter(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorSimpleMoveOfParameter(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     let _ = _move(x) // expected-note {{use here}}
 }
 
-public func errorSimple2MoveOfParameter(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorSimple2MoveOfParameter(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     let _ = consumingUse(x) // expected-note {{use here}}
 }
 
 // TODO: I wonder if we could do better for the 2nd error. At least we tell the
 // user it is due to the loop.
-public func errorLoopMultipleMove(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorLoopMultipleMove(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
                                                       // expected-error @-1 {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     for _ in 0..<1024 {
@@ -137,26 +136,26 @@ public func errorLoopMultipleMove(_ x: Klass) -> () { // expected-error {{'x' us
     }
 }
 
-public func errorLoopMoveOfParameter(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorLoopMoveOfParameter(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     for _ in 0..<1024 {
         consumingUse(x) // expected-note {{use here}}
     }
 }
 
-public func errorLoop2MoveOfParameter(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorLoop2MoveOfParameter(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     for _ in 0..<1024 {
         nonConsumingUse(x) // expected-note {{use here}}
     }
 }
 
-public func errorSimple2MoveOfParameterNonConsume(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorSimple2MoveOfParameterNonConsume(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     let _ = nonConsumingUse(x) // expected-note {{use here}}
 }
 
-public func errorLoopMoveOfParameterNonConsume(_ x: Klass) -> () { // expected-error {{'x' used after being moved}}
+public func errorLoopMoveOfParameterNonConsume(_ x: __owned Klass) -> () { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     for _ in 0..<1024 {
         nonConsumingUse(x) // expected-note {{use here}}
@@ -167,14 +166,14 @@ public func errorLoopMoveOfParameterNonConsume(_ x: Klass) -> () { // expected-e
 // Pattern Match Lets //
 ////////////////////////
 
-public func patternMatchIfCaseLet(_ x: Klass?) {
+public func patternMatchIfCaseLet(_ x: __owned Klass?) {
     if case let .some(y) = x { // expected-error {{'y' used after being moved}}
         let _ = _move(y) // expected-note {{move here}}
         nonConsumingUse(y) // expected-note {{use here}}
     }
 }
 
-public func patternMatchSwitchLet(_ x: Klass?) {
+public func patternMatchSwitchLet(_ x: __owned Klass?) {
     switch x {
     case .none:
         break
@@ -184,7 +183,7 @@ public func patternMatchSwitchLet(_ x: Klass?) {
     }
 }
 
-public func patternMatchSwitchLet2(_ x: (Klass?, Klass?)?) {
+public func patternMatchSwitchLet2(_ x: __owned (Klass?, Klass?)?) {
     switch x {
     case .some((.some(let y), _)): // expected-error {{'y' used after being moved}}
         let _ = _move(y) // expected-note {{move here}}
@@ -194,7 +193,7 @@ public func patternMatchSwitchLet2(_ x: (Klass?, Klass?)?) {
     }
 }
 
-public func patternMatchSwitchLet3(_ x: (Klass?, Klass?)?) { // expected-error {{'x' used after being moved}}
+public func patternMatchSwitchLet3(_ x: __owned (Klass?, Klass?)?) { // expected-error {{'x' used after being moved}}
     let _ = _move(x) // expected-note {{move here}}
     switch x { // expected-note {{use here}}
     case .some((.some(_), .some(let z))): // expected-error {{'z' used after being moved}}
@@ -219,11 +218,10 @@ public struct Pair {
 // have invalidated a part of pair. We can be less restrictive in the future.
 //
 // TODO: Why are we emitting two uses here.
-public func performMoveOnOneEltOfPair(_ p: Pair) { // expected-error {{'p' used after being moved}}
-    let _ = p.z // Make sure we don't crash when we access a trivial value from Pair.
-    let _ = _move(p.x) // expected-note {{move here}}
-    nonConsumingUse(p.y) // expected-note {{use here}}
-                         // expected-note @-1 {{use here}}
+public func performMoveOnOneEltOfPair(_ p: __owned Pair) {
+    let _ = p.z
+    let _ = _move(p.x) // expected-error {{_move applied to value that the compiler does not support checking}}
+    nonConsumingUse(p.y)
 }
 
 public class KlassPair {
@@ -233,7 +231,7 @@ public class KlassPair {
 
 // TODO: Emit a better error here! We should state that we are applying _move to
 // a class field and that is illegal.
-public func performMoveOnOneEltOfKlassPair(_ p: KlassPair) {
+public func performMoveOnOneEltOfKlassPair(_ p: __owned KlassPair) {
     let _ = _move(p.x) // expected-error {{_move applied to value that the compiler does not support checking}}
     nonConsumingUse(p.y)
 }