Merge pull request #39987 from Catfish-Man/printf-in-this-economy

Author: swift-ci

CMakeLists.txt

@@ -93,6 +93,10 @@ option(SWIFT_BUILD_DYNAMIC_STDLIB
 option(SWIFT_BUILD_STATIC_STDLIB
     "Build static variants of the Swift standard library"
     FALSE)
+    
+option(SWIFT_STDLIB_STATIC_PRINT
+    "Build compile-time evaluated vprintf()"
+    FALSE)
 
 option(SWIFT_BUILD_DYNAMIC_SDK_OVERLAY
     "Build dynamic variants of the Swift SDK overlay"

stdlib/cmake/modules/SwiftSource.cmake

@@ -292,6 +292,10 @@ function(_add_target_variant_swift_compile_flags
   if(SWIFT_STDLIB_OS_VERSIONING)
     list(APPEND result "-D" "SWIFT_RUNTIME_OS_VERSIONING")
   endif()
+  
+  if(SWIFT_STDLIB_STATIC_PRINT)
+    list(APPEND result "-D" "SWIFT_STDLIB_STATIC_PRINT")
+  endif()
 
   if(SWIFT_STDLIB_HAS_COMMANDLINE)
     list(APPEND result "-D" "SWIFT_STDLIB_HAS_COMMANDLINE")

stdlib/public/SwiftShims/LibcShims.h

@@ -85,6 +85,19 @@ static inline int _swift_stdlib_memcmp(const void *s1, const void *s2,
 #define CONST_CAST(type, value) (type)value
 #endif
 
+#ifndef _VA_LIST
+typedef __builtin_va_list va_list;
+#define _VA_LIST
+#endif
+
+static inline int _swift_stdlib_vprintf(const char * __restrict fmt, va_list args) {
+    extern int vprintf(const char * __restrict, va_list);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+    return vprintf(fmt, args);
+#pragma clang diagnostic pop
+}
+
 // Non-standard extensions
 #if defined(__APPLE__)
 #define HAS_MALLOC_SIZE 1

stdlib/public/core/CMakeLists.txt

@@ -141,6 +141,7 @@ set(SWIFTLIB_ESSENTIAL
   SmallString.swift
   Sort.swift
   StaticString.swift
+  StaticPrint.swift
   Stride.swift
   StringHashable.swift  # ORDER DEPENDENCY: Must precede String.swift
   String.swift

stdlib/public/core/GroupInfo.json

@@ -221,6 +221,7 @@
     "Runtime.swift",
     "RuntimeFunctionCounters.swift",
     "Shims.swift",
+    "StaticPrint.swift",
     "ThreadLocalStorage.swift",
     "Unmanaged.swift",
     "Availability.swift",