Merge pull request #339 from cielavenir/patch-1

Add withVaList() for environments without ObjC

Author: gparker42

stdlib/public/core/VarArgs.swift

@@ -10,11 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if _runtime(_ObjC)
-// Excluded due to use of dynamic casting and Builtin.autorelease, neither
-// of which correctly work without the ObjC Runtime right now.
-// See rdar://problem/18801510
-
 /// Instances of conforming types can be encoded, and appropriately
 /// passed, as elements of a C `va_list`.
 ///
@@ -82,6 +77,11 @@ public func withVaList<R>(builder: VaListBuilder,
   return result
 }
 
+#if _runtime(_ObjC)
+// Excluded due to use of dynamic casting and Builtin.autorelease, neither
+// of which correctly work without the ObjC Runtime right now.
+// See rdar://problem/18801510
+
 /// Returns a `CVaListPointer` built from `args` that's backed by
 /// autoreleased storage.
 ///
@@ -100,6 +100,7 @@ public func getVaList(args: [CVarArgType]) -> CVaListPointer {
   Builtin.autorelease(builder)
   return builder.va_list()
 }
+#endif
 
 @warn_unused_result
 public func _encodeBitsAsWords<T : CVarArgType>(x: T) -> [Int] {
@@ -237,13 +238,15 @@ extension UnsafeMutablePointer : CVarArgType {
   }
 }
 
+#if _runtime(_ObjC)
 extension AutoreleasingUnsafeMutablePointer : CVarArgType {
   /// Transform `self` into a series of machine words that can be
   /// appropriately interpreted by C varargs.
   public var _cVarArgEncoding: [Int] {
     return _encodeBitsAsWords(self)
   }
 }
+#endif
 
 extension Float : _CVarArgPassedAsDouble, _CVarArgAlignedType {
   /// Transform `self` into a series of machine words that can be
@@ -429,4 +432,3 @@ final public class VaListBuilder {
 
 #endif
 
-#endif // _runtime(_ObjC)

test/1_stdlib/VarArgs.swift

@@ -1,17 +1,19 @@
 // RUN: %target-run-stdlib-swift -parse-stdlib %s | FileCheck %s
 // REQUIRES: executable_test
 
-// XFAIL: linux
-
 import Swift
-import CoreGraphics
 
-@_silgen_name("vprintf")
-func c_vprintf(format: UnsafePointer<Int8>, _ args: CVaListPointer)
+#if _runtime(_ObjC)
+import Darwin
+import CoreGraphics
+#else
+import Glibc
+typealias CGFloat = Double
+#endif
 
 func my_printf(format: String, _ arguments: CVarArgType...) {
   withVaList(arguments) {
-    c_vprintf(format, $0)
+    vprintf(format, $0)
   }
 }
 
@@ -35,7 +37,7 @@ func test_varArgs1() {
 
   // CHECK: dig it: 0  0 -1  1 -2  2 -3  3 -4  4 -5  5 -6  6 -7  7 -8  8 -9  9 -10 10 -11 11
   withVaList(args) {
-    c_vprintf(format + "\n", $0)
+    vprintf(format + "\n", $0)
   }
 }
 test_varArgs1()
@@ -48,12 +50,18 @@ func test_varArgs3() {
   args.append(COpaquePointer(bitPattern: 0x1234_5671))
   args.append(UnsafePointer<Int>(bitPattern: 0x1234_5672))
   args.append(UnsafeMutablePointer<Float>(bitPattern: 0x1234_5673))
+
+#if _runtime(_ObjC)
   args.append(AutoreleasingUnsafeMutablePointer<AnyObject>(
         UnsafeMutablePointer<AnyObject>(bitPattern: 0x1234_5674)))
+#else
+  //Linux does not support AutoreleasingUnsafeMutablePointer; put placeholder.
+  args.append(UnsafeMutablePointer<Float>(bitPattern: 0x1234_5674))
+#endif
 
   // CHECK: {{pointers: '(0x)?0*12345670' '(0x)?0*12345671' '(0x)?0*12345672' '(0x)?0*12345673' '(0x)?0*12345674'}}
   withVaList(args) {
-    c_vprintf(format, $0)
+    vprintf(format, $0)
   }
 }
 test_varArgs3()