[embedded] Use the correct standard putchar signature: func putchar(_: CInt) -> CInt

kubamracek · kubamracek · commit 8dd56d495fe4 · 2024-01-13T21:35:37.000+01:00
diff --git a/stdlib/public/core/EmbeddedPrint.swift b/stdlib/public/core/EmbeddedPrint.swift
@@ -17,24 +17,25 @@ import SwiftShims
 // printing to not need to heap allocate).
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ string: StaticString, terminator: StaticString = "\n") {
   var p = string.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
 
 func printCharacters(_ buf: UnsafeRawBufferPointer) {
   for c in buf {
-    putchar(c)
+    putchar(CInt(c))
   }
 }
 
diff --git a/test/embedded/array-to-pointer.swift b/test/embedded/array-to-pointer.swift
@@ -10,17 +10,18 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/arrays.swift b/test/embedded/arrays.swift
@@ -10,17 +10,18 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/collection.swift b/test/embedded/collection.swift
@@ -10,17 +10,18 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/custom-print.swift b/test/embedded/custom-print.swift
@@ -8,17 +8,18 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/dependencies.swift b/test/embedded/dependencies.swift
@@ -29,17 +29,18 @@
 // UNSUPPORTED: OS=linux-gnu && CPU=aarch64
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/deserialize-vtables.swift b/test/embedded/deserialize-vtables.swift
@@ -22,12 +22,13 @@ extension StaticString {
 }
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 extension Array<UInt8> {
     func print() {
         for byte in self {
-            putchar(byte)
+            putchar(CInt(byte))
         }
         putchar(10)
     }
diff --git a/test/embedded/lto.swift b/test/embedded/lto.swift
@@ -13,17 +13,18 @@
 // REQUIRES: no_asan
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/modules-globals-exec.swift b/test/embedded/modules-globals-exec.swift
@@ -25,17 +25,18 @@ public func foo() {
 import MyModule
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/modules-print-exec.swift b/test/embedded/modules-print-exec.swift
@@ -14,17 +14,18 @@
 // BEGIN MyModule.swift
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
-public func print(_ s: StaticString, terminator: StaticString) {
+public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }
diff --git a/test/embedded/runtime.swift b/test/embedded/runtime.swift
@@ -8,17 +8,18 @@
 // REQUIRES: OS=macosx || OS=linux-gnu
 
 @_silgen_name("putchar")
-func putchar(_: UInt8)
+@discardableResult
+func putchar(_: CInt) -> CInt
 
 public func print(_ s: StaticString, terminator: StaticString = "\n") {
   var p = s.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
   p = terminator.utf8Start
   while p.pointee != 0 {
-    putchar(p.pointee)
+    putchar(CInt(p.pointee))
     p += 1
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,25 @@ import SwiftShims`
`17`	`17`	`// printing to not need to heap allocate).`
`18`	`18`
`19`	`19`	`@_silgen_name("putchar")`
`20`		`-func putchar(_: UInt8)`
	`20`	`+@discardableResult`
	`21`	`+func putchar(_: CInt) -> CInt`
`21`	`22`
`22`	`23`	`public func print(_ string: StaticString, terminator: StaticString = "\n") {`
`23`	`24`	`var p = string.utf8Start`
`24`	`25`	`while p.pointee != 0 {`
`25`		`- putchar(p.pointee)`
	`26`	`+ putchar(CInt(p.pointee))`
`26`	`27`	`p += 1`
`27`	`28`	`}`
`28`	`29`	`p = terminator.utf8Start`
`29`	`30`	`while p.pointee != 0 {`
`30`		`- putchar(p.pointee)`
	`31`	`+ putchar(CInt(p.pointee))`
`31`	`32`	`p += 1`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`func printCharacters(_ buf: UnsafeRawBufferPointer) {`
`36`	`37`	`for c in buf {`
`37`		`- putchar(c)`
	`38`	`+ putchar(CInt(c))`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@ extension StaticString {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@_silgen_name("putchar")`
`25`		`-func putchar(_: UInt8)`
	`25`	`+@discardableResult`
	`26`	`+func putchar(_: CInt) -> CInt`
`26`	`27`
`27`	`28`	`extension Array<UInt8> {`
`28`	`29`	`func print() {`
`29`	`30`	`for byte in self {`
`30`		`- putchar(byte)`
	`31`	`+ putchar(CInt(byte))`
`31`	`32`	`}`
`32`	`33`	`putchar(10)`
`33`	`34`	`}`