Merge remote-tracking branch 'origin/main' into rebranch

2025-12-21 12:14:44 +01:00 · 2021-01-26 06:12:31 -08:00
parent aa4df86c7c fb70ab4279
commit 9d0d1fff60
63 changed files with 177 additions and 127 deletions
--- a/lib/IRGen/IRGen.cpp
+++ b/lib/IRGen/IRGen.cpp
@@ -702,6 +702,10 @@ static void setPointerAuthOptions(PointerAuthOptions &opts,
  opts.TaskResumeFunction =
      PointerAuthSchema(codeKey, /*address*/ true, Discrimination::Constant,
                        SpecialPointerAuthDiscriminators::TaskResumeFunction);
+
+  opts.AsyncContextExtendedFrameEntry = PointerAuthSchema(
+      dataKey, /*address*/ true, Discrimination::Constant,
+      SpecialPointerAuthDiscriminators::SwiftAsyncContextExtendedFrameEntry);
 }

 std::unique_ptr<llvm::TargetMachine>