Skip to content

[embedded][wasm] Fix missing putchar symbol in test #72973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 11, 2024
Merged

[embedded][wasm] Fix missing putchar symbol in test #72973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c9040
[embedded][wasm] Fix missing putchar symbol in test
kateinoigakukun Apr 11, 2024
7a205dc
[embedded] Use @_extern(c) instead of @_silgen_name for putchar
kateinoigakukun Apr 11, 2024
6572319
[embedded] Use @_extern(c) instead of @_silgen_name for putchar in tests
kateinoigakukun Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/public/core/EmbeddedPrint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import SwiftShims
// embedded Swift, in an embedded-programming friendly way (we mainly need
// printing to not need to heap allocate).

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/array-to-pointer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// REQUIRES: optimized_stdlib
// REQUIRES: OS=macosx || OS=linux-gnu

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/arrays.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// REQUIRES: optimized_stdlib
// REQUIRES: OS=macosx || OS=linux-gnu

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
1 change: 1 addition & 0 deletions test/embedded/classes-wasm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>

int putchar(int c) { return c; }
void free(void *ptr) {}

int posix_memalign(void **memptr, size_t alignment, size_t size) {
Expand Down
2 changes: 1 addition & 1 deletion test/embedded/collection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// REQUIRES: optimized_stdlib
// REQUIRES: OS=macosx || OS=linux-gnu

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/custom-print.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// REQUIRES: executable_test
// REQUIRES: OS=macosx || OS=linux-gnu

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/dependencies-no-allocations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// REQUIRES: OS=macosx || OS=linux-gnu
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/dependencies-random.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

// REQUIRES: rdar121923818

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/dependencies.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// REQUIRES: OS=macosx || OS=linux-gnu
// UNSUPPORTED: OS=linux-gnu && CPU=aarch64

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/deserialize-vtables.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extension StaticString {
}
}

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/lto.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// loaded too late").
// REQUIRES: no_asan

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/modules-globals-exec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public func foo() {

import MyModule

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/modules-print-exec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// BEGIN MyModule.swift

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/runtime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// REQUIRES: optimized_stdlib
// REQUIRES: OS=macosx || OS=linux-gnu

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion test/embedded/volatile-exec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import _Volatile

@_silgen_name("putchar")
@_extern(c, "putchar")
@discardableResult
func putchar(_: CInt) -> CInt

Expand Down
2 changes: 1 addition & 1 deletion validation-test/stdlib/MicroStdlib/Inputs/Swift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public struct UnsafeMutablePointer<T> {
public typealias CInt = Int32
public typealias CChar = Int8

@_silgen_name("putchar")
@_extern(c, "putchar")
public func putchar(_: CChar)

public func printHello() {
Expand Down