averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

ClangImporter: Remove -enable-c-function-pointers staging option.

Browse Source 
Swift SVN r29764
This commit is contained in:
Joe Groff
2015-06-27 18:10:21 +00:00
parent 2630dba793
commit 55a830df38
8 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/swift/Basic/LangOptions.h
View File

@@ -77,9 +77,6 @@ namespace swift {
/// symbols as optionals.
bool EnableExperimentalUnavailableAsOptional = false;
/// \brief Enable support for native C function pointer types.
bool EnableCFunctionPointers = true;
/// \brief Enable support for SIMD type imports.
bool EnableSIMDImport = true;

4
include/swift/Option/FrontendOptions.td
View File

@@ -195,10 +195,6 @@ def enable_availability_checking_in_implicit_functions : Flag<["-"],
"enable-availability-checking-in-implicit-functions">,
HelpText<"Enable checking availability in implicit functions">;
def enable_c_function_pointers : Flag<["-"],
"enable-c-function-pointers">,
HelpText<"Enable native C function pointer types">;
def enable_simd_import : Flag<["-"],
"enable-simd-import">,
HelpText<"Enable importing C vector types as SIMD types">;

6
lib/ClangImporter/ImportType.cpp
View File

@@ -326,7 +326,6 @@ namespace {
return getOpaquePointerType();
if (pointeeQualType->isFunctionType()) {
if (Impl.SwiftContext.LangOpts.EnableCFunctionPointers) {
auto funcTy = pointeeType->castTo<FunctionType>();
return {
FunctionType::get(funcTy->getInput(), funcTy->getResult(),
@@ -336,11 +335,6 @@ namespace {
};
}
return Impl.getNamedSwiftTypeSpecialization(Impl.getStdlibModule(),
"CFunctionPointer",
pointeeType);
}
auto quals = pointeeQualType.getQualifiers();
if (quals.hasConst())

3
lib/Frontend/CompilerInvocation.cpp
View File

@@ -638,9 +638,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
Opts.EnableExperimentalUnavailableAsOptional |=
Args.hasArg(OPT_enable_experimental_unavailable_as_optional);
Opts.EnableCFunctionPointers |=
Args.hasArg(OPT_enable_c_function_pointers);
Opts.EnableSIMDImport |=
Args.hasArg(OPT_enable_simd_import);

2
test/Interpreter/SDK/c_pointers.swift
View File

@@ -1,5 +1,5 @@
// RUN: rm -rf %t && mkdir %t
// RUN: %target-build-swift %s -Xfrontend -enable-c-function-pointers -o %t/a.out
// RUN: %target-build-swift %s -o %t/a.out
// RUN: %target-run %t/a.out | FileCheck %s
// REQUIRES: executable_test

2
test/Parse/c_function_pointers.swift
View File

@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -parse -verify -module-name main -enable-c-function-pointers %s
// RUN: %target-swift-frontend -parse -verify -module-name main %s
func global() -> Int { return 0 }
struct S {

2
test/SILGen/c_function_pointers.swift
View File

@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -emit-silgen -enable-c-function-pointers %s | FileCheck %s
// RUN: %target-swift-frontend -emit-silgen %s | FileCheck %s
func values(arg: @convention(c) Int -> Int) -> @convention(c) Int -> Int {
return arg

2
test/SILGen/objc_blocks_bridging.swift
View File

@@ -1,4 +1,4 @@
// RUN: %target-swift-frontend -verify -enable-c-function-pointers -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import -disable-objc-attr-requires-foundation-module %s | FileCheck %s
// RUN: %target-swift-frontend -verify -emit-silgen -sdk %S/Inputs -I %S/Inputs -enable-source-import -disable-objc-attr-requires-foundation-module %s | FileCheck %s
// REQUIRES: objc_interop