[cxx-interop][nfc] Fix test fallout.

Author: zoecarver

test/Interop/Cxx/class/fixit-add-safe-to-import-self-contained.swift

@@ -34,7 +34,7 @@ public func test(x: X) {
   // CHECK: SAFE_TO_IMPORT
 
   // CHECK: note: Mark type 'Ptr' as 'SELF_CONTAINED' in C++ to make methods that use it available in Swift.
-  // CHECK: struct X {
+  // CHECK: struct Ptr {
   // CHECK: ^
   // CHECK: SELF_CONTAINED
   x.other()

test/Interop/Cxx/class/invalid-class-errors.swift

@@ -27,9 +27,18 @@ struct Nested {
 
 import Test
 
-// CHECK: note: record 'A' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
+// CHECK: note: record 'A' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
+// CHECK: struct A {
+// CHECK: ^
+// CHECK: SWIFT_REFERENCE_TYPE(<#retain#>, <#release#>)
 public func test(x: A) { }
-// CHECK: note: record 'B' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
+// CHECK: note: record 'B' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
+// CHECK: struct {{.*}}B {
+// CHECK: ^
+// CHECK: SWIFT_REFERENCE_TYPE(<#retain#>, <#release#>)
 public func test(x: B) { }
-// CHECK: note: record 'Nested' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
-public func test(x: Namespace.Nested) { }
+// CHECK: note: record 'Nested' is not automatically available: does not have a copy constructor or destructor. Does this type have reference semantics?
+// CHECK: struct Nested {
+// CHECK: ^
+// CHECK: SWIFT_REFERENCE_TYPE(<#retain#>, <#release#>)
+public func test(x: Namespace.Nested) { }

test/Interop/Cxx/class/invalid-unsafe-projection-errors.swift

@@ -29,16 +29,16 @@ import Test
 public func test(x: M) {
   // CHECK: note: C++ method 'test1' that returns a pointer of type 'UnsafeMutablePointer' is unavailable.
   // CHECK: note: C++ method 'test1' may return an interior pointer.
-  // CHECK: note: Mark method 'test1' as 'safe_to_import' in C++ to make it available in Swift.
+  // CHECK: note: Mark method 'test1' as 'SAFE_TO_IMPORT' in C++ to make it available in Swift.
   x.test1()
   // CHECK: note: C++ method 'test2' that returns a reference of type 'UnsafeMutablePointer' is unavailable.
   // CHECK: note: C++ method 'test2' may return an interior pointer.
-  // CHECK: note: Mark method 'test2' as 'safe_to_import' in C++ to make it available in Swift.
+  // CHECK: note: Mark method 'test2' as 'SAFE_TO_IMPORT' in C++ to make it available in Swift.
   x.test2()
   // CHECK: note: C++ method 'test3' that returns a value of type 'Ptr' is unavailable.
   // CHECK: note: C++ method 'test3' may return an interior pointer.
-  // CHECK: note: Mark method 'test3' as 'safe_to_import' in C++ to make it available in Swift.
-  // CHECK: note: Mark type 'Ptr' as 'self_contained' in C++ to make methods that use it available in Swift.
+  // CHECK: note: Mark method 'test3' as 'SAFE_TO_IMPORT' in C++ to make it available in Swift.
+  // CHECK: note: Mark type 'Ptr' as 'SELF_CONTAINED' in C++ to make methods that use it available in Swift.
   x.test3()
   // CHECK: note: C++ method 'begin' that returns an iterator is unavailable
   // CHECK: note: C++ methods that return iterators are potentially unsafe. Try re-writing to use Swift iterator APIs.