Revert "[TEST] enable the _Copyable constraint everywhere and see what breaks"

This reverts commit 3421da1cf1a2fa601c69b8f1ae6863f45c55298f.

Author: kavon

lib/Sema/ConstraintSystem.cpp

@@ -1806,8 +1806,7 @@ TypeVariableType *ConstraintSystem::openGenericParameter(
 
   // When move-only types are available, add a constraint to force generic
   // parameters to conform to a "Copyable" protocol.
-//  if (getASTContext().LangOpts.hasFeature(Feature::MoveOnly)) {
-  if (true) {
+  if (getASTContext().LangOpts.hasFeature(Feature::MoveOnly)) {
     ProtocolDecl *copyable = TypeChecker::getProtocol(
         getASTContext(), SourceLoc(), KnownProtocolKind::Copyable);
 

test/Constraints/construction.swift

@@ -59,7 +59,7 @@ acceptString("\(hello), \(world) #\(i)!")
 Optional<Int>(1) // expected-warning{{unused}}
 Optional(1) // expected-warning{{unused}}
 _ = .none as Optional<Int>
-Optional(.none) // expected-error {{type '_Copyable' has no member 'none'}}
+Optional(.none) // expected-error {{cannot infer contextual base in reference to member 'none'}}
 
 // Interpolation
 _ = "\(hello), \(world) #\(i)!"

test/Constraints/generics.swift

@@ -933,7 +933,7 @@ func rdar79757320() {
   }
 
   // FIXME: There has to be a way to propagate holes that makes it easy to suppress failures caused by missing members.
-  _ = Container(value: Value(42).formatted(.S(a: .a, b: .b(0)))) // expected-error {{reference to member 'S' cannot be resolved without a contextual type}}
+  _ = Container(value: Value(42).formatted(.S(a: .a, b: .b(0)))) // expected-error {{type 'R_79757320' has no member 'S'}}
   // expected-error@-1 {{cannot infer contextual base in reference to member 'a'}}
   // expected-error@-2 {{cannot infer contextual base in reference to member 'b'}}
 }

test/Constraints/members.swift

@@ -737,7 +737,7 @@ func rdar66891544() {
   func foo<T>(_: T, defaultT: T? = nil) {}
   func foo<U>(_: U, defaultU: U? = nil) {}
 
-  foo(.bar) // expected-error {{type '_Copyable' has no member 'bar'}}
+  foo(.bar) // expected-error {{cannot infer contextual base in reference to member 'bar'}}
 }
 
 // rdar://55369704 - extraneous diagnostics produced in combination with missing/misspelled members

test/Constraints/rdar68155466.swift

@@ -9,7 +9,7 @@ import Foundation
   }
 }
 
-struct Loop<
+struct Loop< // expected-note {{required by generic struct 'Loop' where 'ID' = '() -> Int'}}
   Data : RandomAccessCollection,
   ID : Hashable,
   Content
@@ -24,4 +24,5 @@ func data() -> [A] {
   return []
 }
 
-_ = Loop(data(), id: \.uniqueID) { $0 } // expected-error {{key path cannot refer to instance method 'uniqueID()'}}
+_ = Loop(data(), id: \.uniqueID) { $0 } // expected-error {{key path cannot refer to instance method 'uniqueID()'}}
+// expected-error@-1 {{type '() -> Int' cannot conform to 'Hashable'}} expected-note@-1 {{only concrete types such as structs, enums and classes can conform to protocols}}

test/Constraints/static_members_on_protocol_in_generic_context.swift

@@ -175,14 +175,14 @@ test_combo(.genericFn(42)) // expected-error {{global function 'test_combo' requ
 
 /* Invalid result types */
 
-extension P { // expected-note 12 {{missing same-type requirement on 'Self'}} {{12-12= where Self == <#Type#>}}
+extension P { // expected-note 13 {{missing same-type requirement on 'Self'}} {{12-12= where Self == <#Type#>}}
   static func generic<T>(_: T) -> T { fatalError() }
   static func genericWithReqs<T: Collection, Q>(_: T) -> Q where T.Element == Q { // expected-note {{in call to function 'genericWithReqs'}} expected-note {{required by static method 'genericWithReqs' where 'T' = '()'}}
     fatalError()
   }
 }
 
-extension P { // expected-note 4 {{missing same-type requirement on 'Self'}}
+extension P { // expected-note 6 {{missing same-type requirement on 'Self'}}
   static var invalidProp: Int { 42 }
   static var selfProp: Self { fatalError() }
   static func invalidMethod() -> Int { 42 }
@@ -224,20 +224,23 @@ _ = P[q: ""].other
 // expected-error@-1 {{static member 'subscript' cannot be used on protocol metatype '(any P).Type'}}
 // expected-error@-2 {{value of type 'Int' has no member 'other'}}
 
-test(.doesntExist) // expected-error {{reference to member 'doesntExist' cannot be resolved without a contextual type}}
-test(.doesnt.exist()) // expected-error {{reference to member 'doesnt' cannot be resolved without a contextual type}}
+test(.doesntExist) // expected-error {{type 'P' has no member 'doesntExist'}}
+test(.doesnt.exist()) // expected-error {{type 'P' has no member 'doesnt'}}
 test(.invalidProp)
 // expected-error@-1 {{contextual member reference to static property 'invalidProp' requires 'Self' constraint in the protocol extension}}
 test(.invalidProp.other)
-// expected-error@-1 {{type '_Copyable' has no member 'invalidProp'}}
+// expected-error@-1 {{contextual member reference to static property 'invalidProp' requires 'Self' constraint in the protocol extension}}
+// expected-error@-2 {{value of type 'Int' has no member 'other'}}
 test(.invalidMethod())
 // expected-error@-1 {{contextual member reference to static method 'invalidMethod()' requires 'Self' constraint in the protocol extension}}
 test(.invalidMethod().other)
-// expected-error@-1 {{type '_Copyable' has no member 'invalidMethod'}}
+// expected-error@-1 {{contextual member reference to static method 'invalidMethod()' requires 'Self' constraint in the protocol extension}}
+// expected-error@-2 {{value of type 'Int' has no member 'other'}}
 test(.generic(42))
 // expected-error@-1 {{contextual member reference to static method 'generic' requires 'Self' constraint in the protocol extension}}
 test(.generic(42).other)
-// expected-error@-1 {{type '_Copyable' has no member 'generic'}}
+// expected-error@-1 {{contextual member reference to static method 'generic' requires 'Self' constraint in the protocol extension}}
+// expected-error@-2 {{value of type 'Int' has no member 'other'}}
 test(.generic(S())) // expected-error {{contextual member reference to static method 'generic' requires 'Self' constraint in the protocol extension}}
 test(.generic(G<Int>())) // expected-error {{contextual member reference to static method 'generic' requires 'Self' constraint in the protocol extension}}
 test(.genericWithReqs([S()])) // expected-error {{contextual member reference to static method 'genericWithReqs' requires 'Self' constraint in the protocol extension}}

test/Sema/diag_ambiguous_overloads.swift

@@ -29,7 +29,7 @@ struct S {
   func g<T>(_ a: T, _ b: Int) -> Void {}
   func g(_ a: String) -> Void {}
   func test2() -> Void {
-    g(.notAThing, 7) // expected-error {{type '_Copyable' has no member 'notAThing'}}
+    g(.notAThing, 7) // expected-error {{cannot infer contextual base in reference to member 'notAThing'}}
   }
 
   func h(_ a: Int, _ b: Int) -> Void {}