Fill out dynamic loading of the runtime attributes section

Author: grynspan

stdlib/public/runtime/CMakeLists.txt

@@ -69,7 +69,8 @@ set(swift_runtime_sources
     SwiftDtoa.cpp
     SwiftTLSContext.cpp
     ThreadingError.cpp
-    AccessibleFunction.cpp)
+    AccessibleFunction.cpp
+    RuntimeAttribute.cpp)
 
 # Acknowledge that the following sources are known.
 set(LLVM_OPTIONAL_SOURCES

stdlib/public/runtime/ImageInspection.h

@@ -55,6 +55,9 @@ void initializeDynamicReplacementLookup();
 /// Load the metadata from the image necessary to find functions by name.
 void initializeAccessibleFunctionsLookup();
 
+/// Load the metadata from the image necessary to find runtime metadata.
+void initializeRuntimeAttributesLookup();
+
 // Callbacks to register metadata from an image to the runtime.
 void addImageProtocolsBlockCallback(const void *baseAddress,
                                     const void *start, uintptr_t size);
@@ -82,6 +85,12 @@ void addImageAccessibleFunctionsBlockCallback(const void *baseAddress,
 void addImageAccessibleFunctionsBlockCallbackUnsafe(const void *baseAddress,
                                                     const void *start,
                                                     uintptr_t size);
+void addImageRuntimeAttributesBlockCallback(const void *baseAddress,
+                                            const void *start,
+                                            uintptr_t size);
+void addImageRuntimeAttributesBlockCallbackUnsafe(const void *baseAddress,
+                                                  const void *start,
+                                                  uintptr_t size);
 
 #if defined(_WIN32)
 /// Configure the environment to allow calling into the Debug Help library.

stdlib/public/runtime/ImageInspectionCommon.cpp

@@ -129,6 +129,13 @@ void swift_addNewDSOImage(swift::MetadataSections *sections) {
     swift::addImageAccessibleFunctionsBlockCallback(
         baseAddress, functions, accessible_funcs_section.length);
 
+  const auto &runtime_attribs_section = sections->swift5_runtime_attributes;
+  const void *functions =
+      reinterpret_cast<void *>(runtime_attribs_section.start);
+  if (runtime_attribs_section.length)
+    swift::addImageRuntimeAttributesBlockCallback(
+        baseAddress, functions, runtime_attribs_section.length);
+
   // Register this section for future enumeration by clients. This should occur
   // after this function has done all other relevant work to avoid a race
   // condition when someone calls swift_enumerateAllMetadataSections() on
@@ -168,6 +175,9 @@ void swift::initializeDynamicReplacementLookup() {
 void swift::initializeAccessibleFunctionsLookup() {
 }
 
+void swift::initializeRuntimeAttributesLookup() {
+}
+
 #ifndef NDEBUG
 
 SWIFT_RUNTIME_EXPORT

stdlib/public/runtime/ImageInspectionCommon.h

@@ -51,7 +51,7 @@
 
 namespace swift {
 struct MetadataSections;
-static constexpr const uintptr_t CurrentSectionMetadataVersion = 2;
+static constexpr const uintptr_t CurrentSectionMetadataVersion = 3;
 }
 
 struct SectionInfo {

stdlib/public/runtime/ImageInspectionMachO.cpp

@@ -45,6 +45,8 @@ constexpr const char DynamicReplacementSomeSection[] =
     MachODynamicReplacementSomeSection;
 constexpr const char AccessibleFunctionsSection[] =
     MachOAccessibleFunctionsSection;
+constexpr const char RuntimeAttributesSection[] =
+    MachORuntimeAttributesSection;
 constexpr const char TextSegment[] = MachOTextSegment;
 
 #if __POINTER_WIDTH__ == 64
@@ -171,5 +173,11 @@ void swift::initializeAccessibleFunctionsLookup() {
                        addImageAccessibleFunctionsBlockCallbackUnsafe>);
 }
 
+void swift::initializeRuntimeAttributesLookup() {
+  REGISTER_FUNC(
+      addImageCallback<TextSegment, RuntimeAttributesSection,
+                       addImageRuntimeAttributesBlockCallbackUnsafe>);
+}
+
 #endif // defined(__APPLE__) && defined(__MACH__) &&
        // !defined(SWIFT_RUNTIME_STATIC_IMAGE_INSPECTION)

stdlib/public/runtime/ImageInspectionStatic.cpp

@@ -86,5 +86,14 @@ void swift::initializeAccessibleFunctionsLookup() {
     return;
   addImageAccessibleFunctionsBlockCallbackUnsafe(__dso_handle, start, size);
 }
+void swift::initializeRuntimeAttributesLookup() {
+  void *start;
+  uintptr_t size;
+  GET_SECTION_START_AND_SIZE(start, size, MachOTextSegment,
+                             MachORuntimeAttributesSection);
+  if (start == nullptr || size == 0)
+    return;
+  addImageRuntimeAttributesBlockCallbackUnsafe(__dso_handle, start, size);
+}
 
 #endif // defined(__MACH__) && defined(SWIFT_RUNTIME_STATIC_IMAGE_INSPECTION)

stdlib/public/runtime/RuntimeAttribute.cpp

@@ -0,0 +1,40 @@
+//===---- AccessibleFunction.cpp - Swift protocol conformance checking ----===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// Checking and caching of Swift runtime attributes.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ImageInspection.h"
+#include "swift/Basic/Lazy.h"
+
+using namespace swift;
+
+// TODO: implement me!
+static Lazy<int> Functions;
+
+void
+swift::addImageRuntimeAttributesBlockCallbackUnsafe(const void *baseAddress,
+                                                    const void *attribs,
+                                                    uintptr_t size) {
+    auto &C = Functions.unsafeGetAlreadyInitialized();
+    // TODO: implement me!
+    // _registerRuntimeAttributes(C, RuntimeAttributesSection{attribs, size});
+}
+
+void
+swift::addImageRuntimeAttributesBlockCallback(const void *baseAddress,
+                                              const void *attribs,
+                                              uintptr_t size) {
+    Functions.get();
+    addImageRuntimeAttributesBlockCallbackUnsafe(baseAddress, attribs, size);
+}