[embedded] Add an embedded test for -enable-import-ptrauth-field-function-pointers, fix deserialization

Author: kubamracek

lib/Serialization/DeserializeSIL.cpp

@@ -2368,7 +2368,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     SILValue op = getLocalValue(
         ValID, getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn));
     auto accessKind = SILAccessKind(Attr & 0x3);
-    auto enforcement = SILAccessEnforcement((Attr >> 2) & 0x3);
+    auto enforcement = SILAccessEnforcement((Attr >> 2) & 0x07);
     bool noNestedConflict = (Attr >> 4) & 0x01;
     bool fromBuiltin = (Attr >> 5) & 0x01;
     ResultInst = Builder.createBeginAccess(Loc, op, accessKind, enforcement,
@@ -2410,7 +2410,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
         getLocalValue(ValID2, getSILType(MF->getType(TyID2),
                                          (SILValueCategory)TyCategory2, Fn));
     auto accessKind = SILAccessKind(Attr & 0x3);
-    auto enforcement = SILAccessEnforcement((Attr >> 2) & 0x03);
+    auto enforcement = SILAccessEnforcement((Attr >> 2) & 0x07);
     bool noNestedConflict = (Attr >> 4) & 0x01;
     bool fromBuiltin = (Attr >> 5) & 0x01;
     ResultInst = Builder.createBeginUnpairedAccess(
@@ -2422,7 +2422,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     SILValue op = getLocalValue(
         ValID, getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn));
     bool aborted = Attr & 0x1;
-    auto enforcement = SILAccessEnforcement((Attr >> 1) & 0x03);
+    auto enforcement = SILAccessEnforcement((Attr >> 1) & 0x07);
     bool fromBuiltin = (Attr >> 3) & 0x01;
     ResultInst = Builder.createEndUnpairedAccess(Loc, op, enforcement, aborted,
                                                  fromBuiltin);

test/embedded/ptrauth-fieldptr1.swift

@@ -0,0 +1,31 @@
+// RUN: %empty-directory(%t)
+// RUN: %{python} %utils/split_file.py -o %t %s
+
+// RUN: %target-swift-frontend -enable-import-ptrauth-field-function-pointers -O -emit-ir %t/Main.swift -enable-experimental-feature Embedded -import-objc-header %t/header.h | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
+// REQUIRES: CPU=arm64e
+
+// BEGIN header.h
+
+struct MyStruct {
+    void (*fptr1)(void);
+    void (*__ptrauth(0, 0, 0x4242) fptr2)(void);
+};
+
+// BEGIN Main.swift
+
+public func test1(x: UnsafePointer<MyStruct>) {
+    x.pointee.fptr1()
+}
+
+public func test2(x: UnsafePointer<MyStruct>) {
+    x.pointee.fptr2()
+}
+
+// CHECK: define {{.*}}@"$s4Main5test11xySPySo8MyStructVG_tF"
+// CHECK:   call {{.*}}[ "ptrauth"(i32 0, i64 0) ]
+// CHECK: define {{.*}}@"$s4Main5test21xySPySo8MyStructVG_tF"
+// CHECK:   call {{.*}}[ "ptrauth"(i32 0, i64 16962) ]

test/embedded/ptrauth-fieldptr2.swift

@@ -0,0 +1,43 @@
+// RUN: %empty-directory(%t)
+// RUN: %{python} %utils/split_file.py -o %t %s
+
+// RUN: %target-swift-frontend -enable-import-ptrauth-field-function-pointers -O -emit-module -o %t/Module.swiftmodule %t/Module.swift -enable-experimental-feature Embedded -import-objc-header %t/header.h
+
+// RUN: %target-swift-frontend -enable-import-ptrauth-field-function-pointers -O -emit-ir %t/Main.swift -I%t -enable-experimental-feature Embedded -import-objc-header %t/header.h
+
+// REQUIRES: swift_in_compiler
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
+// REQUIRES: CPU=arm64e
+
+// BEGIN header.h
+
+#pragma once
+struct MyStruct {
+    void (*fptr1)(void);
+    void (*__ptrauth(0, 0, 0x4242) fptr2)(void);
+};
+
+// BEGIN Module.swift
+
+public func test1(x: UnsafePointer<MyStruct>) {
+    x.pointee.fptr1()
+}
+
+public func test2(x: UnsafePointer<MyStruct>) {
+    x.pointee.fptr2()
+}
+
+// BEGIN Main.swift
+
+import Module
+
+public func mainfunc(x: UnsafePointer<MyStruct>) {
+    test1(x: x)
+    test2(x: x)
+}
+
+// CHECK: define {{.*}}@"$s4Main5test11xySPySo8MyStructVG_tF"
+// CHECK:   call {{.*}}[ "ptrauth"(i32 0, i64 0) ]
+// CHECK: define {{.*}}@"$s4Main5test21xySPySo8MyStructVG_tF"
+// CHECK:   call {{.*}}[ "ptrauth"(i32 0, i64 16962) ]