Skip to content

Commit 8c66989

Browse files
committed
Enable importing ptrauth qualified function pointers from c by default
rdar://109235426
1 parent 36d333c commit 8c66989

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,9 +1170,6 @@ def enable_move_inout_stack_protector :
11701170
Flag<["-"], "enable-move-inout-stack-protector">,
11711171
HelpText<"Enable the stack protector by moving values to temporaries">;
11721172

1173-
def enable_import_ptrauth_field_function_pointers :
1174-
Flag<["-"], "enable-import-ptrauth-field-function-pointers">,
1175-
HelpText<"Enable import of custom ptrauth qualified field function pointers">;
11761173
def disable_import_ptrauth_field_function_pointers :
11771174
Flag<["-"], "disable-import-ptrauth-field-function-pointers">,
11781175
HelpText<"Disable import of custom ptrauth qualified field function pointers">;

lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,9 +2189,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
21892189
OPT_enable_move_inout_stack_protector, OPT_disable_stack_protector,
21902190
Opts.EnableMoveInoutStackProtection);
21912191
Opts.EnableImportPtrauthFieldFunctionPointers =
2192-
Args.hasArg(OPT_enable_import_ptrauth_field_function_pointers,
2193-
OPT_disable_import_ptrauth_field_function_pointers,
2194-
Opts.EnableImportPtrauthFieldFunctionPointers);
2192+
!Args.hasArg(OPT_disable_import_ptrauth_field_function_pointers);
21952193
Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all);
21962194
Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none);
21972195
Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);

test/IRGen/ptrauth_field_fptr_import.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-ir -target arm64e-apple-ios13.0 -I %S/Inputs/ -validate-tbd-against-ir=none -Xllvm -sil-disable-pass=OnoneSimplification | %FileCheck %s
1+
// RUN: %swift-frontend %s -emit-ir -target arm64e-apple-ios13.0 -I %S/Inputs/ -validate-tbd-against-ir=none -Xllvm -sil-disable-pass=OnoneSimplification | %FileCheck %s
22
// REQUIRES: CPU=arm64e
33
// REQUIRES: OS=ios
44

test/SILGen/ptrauth_field_fptr_import.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ | %FileCheck %s
1+
// RUN: %swift-frontend %s -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ | %FileCheck %s
22

33
// REQUIRES: CPU=arm64e
44
// REQUIRES: OS=ios

0 commit comments

Comments
 (0)