Clang importer SDK: separate out CoreFoundation.h so we can build it up.

Swift SVN r21375
apple · Aug 21, 2014 · 2886625 · 2886625
1 parent 4a45129
commit 2886625
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/test/ClangModules/ctypes_parse.swift b/test/ClangModules/ctypes_parse.swift
@@ -6,6 +6,7 @@
 import ctypes
 import CoreGraphics
 import Foundation
+import CoreFoundation
 
 var cgPointVar: CGPoint
 
@@ -177,7 +178,7 @@ func testImportSysTypesTypes() {
 
 func testImportCFTypes() {
   var t1_unqual: Int = CFIndex_test
-  var t1_qual: ctypes.CFIndex = t1_unqual
+  var t1_qual: CoreFoundation.CFIndex = t1_unqual
 }
 
 func testImportOSTypesTypes() {

diff --git a/test/Inputs/clang-importer-sdk/usr/include/CoreFoundation.h b/test/Inputs/clang-importer-sdk/usr/include/CoreFoundation.h
@@ -0,0 +1,7 @@
+typedef const void *CFTypeRef;
+typedef struct __CFString *CFMutableStringRef;
+typedef struct __CFString const *CFStringRef;
+typedef struct __CFTree *CFTreeRef;
+
+typedef signed long CFIndex;
+extern CFIndex CFIndex_test;
diff --git a/test/Inputs/clang-importer-sdk/usr/include/ctypes.h b/test/Inputs/clang-importer-sdk/usr/include/ctypes.h
@@ -29,11 +29,7 @@ typedef struct {
   };
 } AnonStructs;
 
-typedef const void *CFTypeRef;
 typedef void const *HWND;
-typedef struct __CFString *CFMutableStringRef;
-typedef struct __CFString const *CFStringRef;
-typedef struct __CFTree *CFTreeRef;
 
 struct StructWithBitfields {
   unsigned First;
@@ -143,10 +139,6 @@ STDLIB_TYPEDEF(__UINT64_TYPE__, u_int64_t);
 STDLIB_TYPEDEF(signed int, SInt);
 STDLIB_TYPEDEF(unsigned int, UInt);
 
-// Types from CoreFoundation.
-STDLIB_TYPEDEF(signed long, CFIndex);
-
-
 void noreturnFunction() __attribute__((noreturn));
 void couldReturnFunction() __attribute__((noreturn));
 

diff --git a/test/Inputs/clang-importer-sdk/usr/include/module.map b/test/Inputs/clang-importer-sdk/usr/include/module.map
@@ -17,6 +17,10 @@ module CoreGraphics {
   header "CoreGraphics.h"
   export *
 }
+module CoreFoundation {
+  header "CoreFoundation.h" 
+  export *
+}
 module Foundation {
   header "Foundation.h" 
   export *

diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift
@@ -8,7 +8,7 @@
 // RUN: FileCheck --check-prefix=NEGATIVE %s < %t/classes.h
 // RUN: %check-in-clang %t/classes.h
 // RUN: not %check-in-clang -fno-modules %t/classes.h
-// RUN: %check-in-clang -fno-modules %t/classes.h -include Foundation.h -include ctypes.h
+// RUN: %check-in-clang -fno-modules %t/classes.h -include Foundation.h -include ctypes.h -include CoreFoundation.h
 
 // CHECK-NOT: AppKit;
 // CHECK-NOT: Properties;
@@ -23,6 +23,7 @@ import Foundation
 import AppKit // only used in implementations
 import ctypes
 import Properties // completely unused
+import CoreFoundation
 
 // CHECK-LABEL: @interface A1{{$}}
 // CHECK-NEXT: init