SIL: Don't ask for stored properites of resilient classes in SILModule::getFieldIndex()

slavapestov · slavapestov · commit fc80b51374a7 · 2025-10-15T13:44:42.000-04:00
diff --git a/lib/SIL/IR/SILModule.cpp b/lib/SIL/IR/SILModule.cpp
@@ -804,7 +804,10 @@ unsigned SILModule::getFieldIndex(NominalTypeDecl *decl, VarDecl *field) {
   if (auto *classDecl = dyn_cast<ClassDecl>(decl)) {
     for (auto *superDecl = classDecl->getSuperclassDecl(); superDecl != nullptr;
          superDecl = superDecl->getSuperclassDecl()) {
-      index += superDecl->getStoredProperties().size();
+      if (!superDecl->isResilient(getSwiftModule(),
+                                  ResilienceExpansion::Maximal)) {
+        index += superDecl->getStoredProperties().size();
+      }
     }
   }
   for (VarDecl *property : decl->getStoredProperties()) {

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,10 @@ unsigned SILModule::getFieldIndex(NominalTypeDecl decl, VarDecl field) {`
`804`	`804`	`if (auto *classDecl = dyn_cast<ClassDecl>(decl)) {`
`805`	`805`	`for (auto *superDecl = classDecl->getSuperclassDecl(); superDecl != nullptr;`
`806`	`806`	`superDecl = superDecl->getSuperclassDecl()) {`
`807`		`- index += superDecl->getStoredProperties().size();`
	`807`	`+ if (!superDecl->isResilient(getSwiftModule(),`
	`808`	`+ ResilienceExpansion::Maximal)) {`
	`809`	`+ index += superDecl->getStoredProperties().size();`
	`810`	`+ }`
`808`	`811`	`}`
`809`	`812`	`}`
`810`	`813`	`for (VarDecl *property : decl->getStoredProperties()) {`