Merge pull request #42327 from xedin/ptrauth-for-dist-5.7

[5.7][Runtime] Add pointer auth to accessible function section/cache

Author: xedin

include/swift/ABI/MetadataValues.h

@@ -1424,6 +1424,9 @@ namespace SpecialPointerAuthDiscriminators {
 
   /// Dispatch integration.
   const uint16_t DispatchInvokeFunction = 0xf493; // = 62611
+
+  /// Functions accessible at runtime (i.e. distributed method accessors).
+  const uint16_t AccessibleFunctionRecord = 0x438c; // = 17292
 }
 
 /// The number of arguments that will be passed directly to a generic

include/swift/Runtime/Config.h

@@ -302,6 +302,9 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_dispatch_invoke_function                               \
   __ptrauth(ptrauth_key_process_independent_code, 1,                           \
             SpecialPointerAuthDiscriminators::DispatchInvokeFunction)
+#define __ptrauth_swift_accessible_function_record                             \
+  __ptrauth(ptrauth_key_process_independent_data, 1,                           \
+            SpecialPointerAuthDiscriminators::AccessibleFunctionRecord)
 #define __ptrauth_swift_objc_superclass                                        \
   __ptrauth(ptrauth_key_process_independent_data, 1,                           \
             swift::SpecialPointerAuthDiscriminators::ObjCSuperclass)
@@ -334,6 +337,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_cancellation_notification_function
 #define __ptrauth_swift_escalation_notification_function
 #define __ptrauth_swift_dispatch_invoke_function
+#define __ptrauth_swift_accessible_function_record
 #define __ptrauth_swift_objc_superclass
 #define __ptrauth_swift_runtime_function_entry
 #define __ptrauth_swift_runtime_function_entry_with_key(__key)

stdlib/public/runtime/AccessibleFunction.cpp

@@ -30,7 +30,10 @@ using namespace swift;
 namespace {
 
 struct AccessibleFunctionsSection {
-  const AccessibleFunctionRecord *Begin, *End;
+  const AccessibleFunctionRecord *__ptrauth_swift_accessible_function_record
+      Begin;
+  const AccessibleFunctionRecord *__ptrauth_swift_accessible_function_record
+      End;
 
   AccessibleFunctionsSection(const AccessibleFunctionRecord *begin,
                              const AccessibleFunctionRecord *end)
@@ -51,20 +54,20 @@ struct AccessibleFunctionCacheEntry {
   const char *Name;
   size_t NameLength;
 
-  const AccessibleFunctionRecord *Func;
+  const AccessibleFunctionRecord *__ptrauth_swift_accessible_function_record R;
 
 public:
   AccessibleFunctionCacheEntry(llvm::StringRef name,
-                               const AccessibleFunctionRecord *func)
-      : Func(func) {
+                               const AccessibleFunctionRecord *record)
+      : R(record) {
     char *Name = reinterpret_cast<char *>(malloc(name.size()));
     memcpy(Name, name.data(), name.size());
 
     this->Name = Name;
     this->NameLength = name.size();
   }
 
-  const AccessibleFunctionRecord *getFunction() const { return Func; }
+  const AccessibleFunctionRecord *getRecord() const { return R; }
 
   bool matchesKey(llvm::StringRef name) {
     return name == llvm::StringRef{Name, NameLength};
@@ -139,21 +142,21 @@ swift::runtime::swift_findAccessibleFunction(const char *targetNameStart,
   {
     auto snapshot = S.Cache.snapshot();
     if (auto E = snapshot.find(name))
-      return E->getFunction();
+      return E->getRecord();
   }
 
   // If entry doesn't exist (either record doesn't exist, hasn't been loaded, or
   // requested yet), let's try to find it and add to the cache.
 
-  auto *function = _searchForFunctionRecord(S, name);
-  if (function) {
+  auto *record = _searchForFunctionRecord(S, name);
+  if (record) {
     S.Cache.getOrInsert(
         name, [&](AccessibleFunctionCacheEntry *entry, bool created) {
           if (created)
-            new (entry) AccessibleFunctionCacheEntry{name, function};
+            new (entry) AccessibleFunctionCacheEntry{name, record};
           return true;
         });
   }
 
-  return function;
+  return record;
 }