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

Author: swift-ci

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -75,6 +75,12 @@ fileprivate func emitDiagnosticParts(
       replaceEndLoc = bridgedSourceLoc(at: oldToken.endPosition)
       newText = newTrivia.description
 
+    case .replaceChild(let replacingChildData):
+      let replacementRange = replacingChildData.replacementRange
+      replaceStartLoc = bridgedSourceLoc(at: replacementRange.lowerBound)
+      replaceEndLoc = bridgedSourceLoc(at: replacementRange.upperBound)
+      newText = replacingChildData.newChild.description
+      
 #if RESILIENT_SWIFT_SYNTAX
     @unknown default:
       fatalError()
@@ -221,6 +227,18 @@ extension SourceManager {
         )
         newText = newTrivia.description
 
+      case .replaceChild(let replacingChildData):
+        let replacementRange = replacingChildData.replacementRange
+        replaceStartLoc = bridgedSourceLoc(
+          for: replacingChildData.parent,
+          at: replacementRange.lowerBound
+        )
+        replaceEndLoc = bridgedSourceLoc(
+          for: replacingChildData.parent,
+          at: replacementRange.upperBound
+        )
+        newText = replacingChildData.newChild.description
+        
 #if RESILIENT_SWIFT_SYNTAX
       @unknown default:
         fatalError()

lib/IRGen/GenClass.cpp

@@ -1401,6 +1401,12 @@ namespace {
       }
 
       auto dataPtr = emitROData(ForMetaClass, DoesNotHaveUpdateCallback);
+
+      // Record the ro-data globals if this is a pre-specialized class.
+      if (specializedGenericType) {
+        IGM.addGenericROData(dataPtr);
+      }
+
       dataPtr = llvm::ConstantExpr::getPtrToInt(dataPtr, IGM.IntPtrTy);
 
       llvm::Constant *fields[] = {
@@ -2683,7 +2689,14 @@ static llvm::Constant *doEmitClassPrivateData(
   }
 
   // Then build the class RO-data.
-  return builder.emitROData(ForClass, hasUpdater);
+  auto res = builder.emitROData(ForClass, hasUpdater);
+
+  // Record the ro-data globals if this is a pre-specialized class.
+  if (classUnion.isa<std::pair<ClassDecl*, CanType>>()) {
+    IGM.addGenericROData(res);
+  }
+
+  return res;
 }
 
 llvm::Constant *irgen::emitSpecializedGenericClassPrivateData(

test/IRGen/generic_class_rodata_list.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-emit-generic-class-ro_t-list -S %s -o - | %FileCheck %s
+// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %target-cpu-apple-macosx12.0 -enable-emit-generic-class-ro_t-list -S %s -o - | %FileCheck %s
 // REQUIRES: objc_interop
 // REQUIRES: CPU=x86_64 || CPU=arm64
 // REQUIRES: OS=macosx
@@ -30,11 +30,33 @@
 // CHECK:         .quad   0
 // CHECK:         .quad   __CLASS_METHODS__TtC25generic_class_rodata_list9Somethin
 
+
+// CHECK: __METACLASS_DATA_$s25generic_class_rodata_list9SomethingCySuGMf:
+// CHECK:         .long   129
+// CHECK:         .long   40
+// CHECK:         .long   40
+// CHECK:         .long   0
+// CHECK:         .quad   _$s25generic_class_rodata_list9SomethingCySuGMf+24
+// CHECK:         .quad   0
+// CHECK:         .quad   __CLASS_METHODS_$s25generic_class_rodata_list9SomethingCySuGMf
+
+// CHECK: __DATA_$s25generic_class_rodata_list9SomethingCySuGMf:
+// CHECK:         .long   128
+// CHECK:         .long   16
+// CHECK:         .long   16
+// CHECK:         .long   0
+// CHECK:         .quad   0
+// CHECK:         .quad   0
+// CHECK:         .quad   __INSTANCE_METHODS_$s25generic_class_rodata_list9SomethingCySuGMf
+
+
 // CHECK:        .section        __DATA,__objc_clsrolist
 // CHECK:        .p2align        3
 // CHECK:_generic_ro_datas:
 // CHECK:        .quad   ___unnamed_1+40
 // CHECK:        .quad   ___unnamed_1+112
+// CHECK:        .quad   __METACLASS_DATA_$s25generic_class_rodata_list9SomethingCySuGMf
+// CHECK:        .quad   __DATA_$s25generic_class_rodata_list9SomethingCySuGMf
 
 import Foundation
 
@@ -44,3 +66,11 @@ public class Something<T> {
   @objc
   public static func myStaticMethod() { print("static") }
 }
+
+public protocol P {
+    func t<T>(_ t: T)
+}
+
+public func some(_ arr : Something<UInt>, p: P) {
+  p.t(arr)
+}