Merge pull request #68149 from gottesmm/send-non-sendable-fixes

[send-non-sendable] Some small bug fixes/cleanups/updates to use LLVM data structures

Author: gottesmm

include/swift/SIL/SILFunction.h

@@ -1422,6 +1422,14 @@ class SILFunction
     return getArguments().back();
   }
 
+  /// Like getSelfArgument() except it returns a nullptr if we do not have a
+  /// selfparam.
+  const SILArgument *maybeGetSelfArgument() const {
+    if (!hasSelfParam())
+      return nullptr;
+    return getArguments().back();
+  }
+
   const SILArgument *getDynamicSelfMetadata() const {
     assert(hasDynamicSelfMetadata() && "This method can only be called if the "
            "SILFunction has a self-metadata parameter");

lib/SIL/Parser/SILParserFunctionBuilder.h

@@ -31,6 +31,15 @@ class LLVM_LIBRARY_VISIBILITY SILParserFunctionBuilder {
         IsNotTransparent, IsNotSerialized, IsNotDynamic, IsNotDistributed,
         IsNotRuntimeAccessible);
     result->setDebugScope(new (builder.mod) SILDebugScope(loc, result));
+
+    // If we did not have a declcontext set, as a fallback set the parent module
+    // of our SILFunction to the parent module of our SILModule.
+    //
+    // DISCUSSION: This ensures that we can perform protocol conformance checks.
+    if (!result->getDeclContext()) {
+      result->setParentModule(result->getModule().getSwiftModule());
+    }
+
     return result;
   }
 };