Merge pull request #64449 from atrick/cleanup-conversion-tests

[NFC] Cleanup implicit pointer conversion diagnostic tests

Author: atrick

test/SILGen/diagnose_implicit_raw_conversion.swift

@@ -38,6 +38,8 @@ func test_errors<T>(arg: T, sarg: String) {
 
     let constArray: [T] = [arg]
     readBytes(constArray) // expected-warning {{forming 'UnsafeRawPointer' to a variable of type '[T]'; this is likely incorrect because 'T' may contain an object reference.}}
+    read_char(constArray) // expected-warning {{forming 'UnsafePointer<CChar>' (aka 'UnsafePointer<Int8>') to a variable of type '[T]'; this is likely incorrect because 'T' may contain an object reference.}}
+    read_uchar(constArray) // expected-warning {{forming 'UnsafePointer<UInt8>' to a variable of type '[T]'; this is likely incorrect because 'T' may contain an object reference.}}
 
     var array: [T] = [arg]
     readBytes(&array)     // expected-warning {{forming 'UnsafeRawPointer' to a variable of type '[T]'; this is likely incorrect because 'T' may contain an object reference.}}
@@ -81,6 +83,8 @@ func test_explicit<T>(arg: T, sarg: String) {
     let constArray: [T] = [arg]
     constArray.withUnsafeBytes() {
         readBytes($0.baseAddress!)
+        read_char($0.baseAddress!)
+        read_uchar($0.baseAddress!)
     }
     var array: [T] = [arg]
     array.withUnsafeBytes() {
@@ -118,10 +122,10 @@ func test_accepted<I: FixedWidthInteger>(intArg: I, sarg: String, simdArg: SIMD4
     read_uchar(&int)
     write_uchar(&int)
 
-    let constArray: [I] = [intArg]
-    readBytes(constArray)
-    // read_char(constArray) - this case never worked because of a bug in SE-0324
-    // read_uchar(constArray) - this case never worked because of a bug in SE-0324
+    let constIntArray: [I] = [intArg]
+    readBytes(constIntArray)
+    read_char(constIntArray)
+    read_uchar(constIntArray)
 
     var intArray: [I] = [intArg]
     readBytes(&intArray)
@@ -131,6 +135,11 @@ func test_accepted<I: FixedWidthInteger>(intArg: I, sarg: String, simdArg: SIMD4
     read_uchar(&intArray)
     write_uchar(&intArray)
 
+    let constByteArray: [UInt8] = [0]
+    readBytes(constByteArray)
+    read_char(constByteArray)
+    read_uchar(constByteArray)
+
     var byteArray: [UInt8] = [0]
     readBytes(&byteArray)
     writeBytes(&byteArray)
@@ -140,6 +149,19 @@ func test_accepted<I: FixedWidthInteger>(intArg: I, sarg: String, simdArg: SIMD4
     read_uchar(byteArray)
     write_uchar(&byteArray)
 
+    let constInt8Array: [Int8] = [0]
+    readBytes(constInt8Array)
+    read_char(constInt8Array)
+    read_uchar(constInt8Array)
+
+    var int8Array: [Int8] = [0]
+    readBytes(&int8Array)
+    writeBytes(&int8Array)
+    read_char(&int8Array)
+    write_char(&int8Array)
+    read_uchar(&int8Array)
+    write_uchar(&int8Array)
+
     let string: String = sarg
     readBytes(string)
     readUInt8(string)

test/SILGen/diagnose_implicit_raw_conversion_unsupported.swift

@@ -39,26 +39,3 @@ func test_unsupported<T>(arg: T) {
     writeInt8(&byteArray) // expected-error {{cannot convert value of type 'UnsafeMutablePointer<UInt8>' to expected argument type 'UnsafeMutablePointer<Int8>'}}
                           // expected-note@-1 {{arguments to generic parameter 'Pointee' ('UInt8' and 'Int8') are expected to be equal}}
 }
-
-// Array<T> to C pointer conversion is supported under SE-0324
-func test_array_to_c_pointer_concrete() {
-    let constIntArray: [Int8] = [0]
-    read_uchar(constIntArray)
-
-    let constUIntArray: [UInt8] = [0]
-    read_char(constUIntArray)
-
-    var intArray: [Int8] = [0] // expected-warning {{variable 'intArray' was never mutated; consider changing to 'let' constant}}
-    read_uchar(intArray)
-
-    var uintArray: [UInt8] = [0] // expected-warning {{variable 'uintArray' was never mutated; consider changing to 'let' constant}}
-    read_char(uintArray)
-
-}
-
-// Array<T> to C pointer conversion is supported under SE-0324
-func test_array_to_c_pointer_generic<T>(arg: T) {
-    let constArray: [T] = [arg]
-    read_char(constArray)
-    read_uchar(constArray)
-}