---

yaml
---
r: 347371
b: refs/heads/master
c: c37744d
h: refs/heads/master
i:
  347369: 9e2e30f
  347367: 06be74d

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 996dc153803c4ba0331868be2849512f094bb43f
+refs/heads/master: c37744dc42c1b4480be0d065a57d047458875444
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/ClangImporter/cfuncs_parse.swift

@@ -9,7 +9,12 @@ func test_cfunc1(_ i: Int) {
 }
 
 func test_cfunc2(_ i: Int) {
+#if os(Windows) && (arch(arm64) || arch(x86_64))
+  // LLP64 targets will import `long` as `Int32`
+  let f = cfunc2(Int32(i), 17)
+#else
   let f = cfunc2(i, 17)
+#endif
   _ = f as Float
   cfunc2(b:17, a:i) // expected-error{{extraneous argument labels 'b:a:' in call}}
   cfunc2(17, i) // expected-error{{cannot convert value of type 'Int' to expected argument type 'Int32'}}

trunk/test/ClangImporter/ctypes_parse.swift

@@ -31,7 +31,7 @@ func testTribool() {
 func testAnonEnum() {
   var a = AnonConst1
   a = AnonConst2
-#if arch(i386) || arch(arm)
+#if arch(i386) || arch(arm) || os(Windows)
   _ = a as CUnsignedLongLong
 #elseif arch(x86_64) || arch(arm64) || arch(powerpc64) || arch(powerpc64le) || arch(s390x)
   _ = a as CUnsignedLong

trunk/test/Inputs/clang-importer-sdk/usr/include/ctypes.h

@@ -7,10 +7,18 @@ enum Tribool {
   True, False, Indeterminate
 };
 
-enum {
+// This is explicitly sized on Windows since we do not use the type to infer the
+// type that we are importing it as as this is known to be explicitly different
+// in that environment.
+enum
+#if defined(_WIN32)
+: unsigned long long
+#endif
+{
   AnonConst1 = 0x700000000,
   AnonConst2
 };
+_Static_assert(sizeof(AnonConst1) == 8);
 
 enum {
   AnonConstSmall1 = 16,