Merge pull request #85867 from egorzhdan/egorzhdan/iterator-invalidation

egorzhdan · web-flow · commit 21440b3fa999 · 2025-12-06T18:31:05.000Z
[cxx-interop] Fix iterator invalidation
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -2645,7 +2645,8 @@ namespace {
           structResult->setIsCxxNonTrivial(isAddressOnly);
         }
 
-        for (auto &getterAndSetter : Impl.GetterSetterMap[result]) {
+        auto gettersAndSetters = Impl.GetterSetterMap[result];
+        for (auto &getterAndSetter : gettersAndSetters) {
           auto getter = getterAndSetter.second.first;
           auto setter = getterAndSetter.second.second;
           // We cannot make a computed property without a getter.

Original file line number	Diff line number	Diff line change
`@@ -2645,7 +2645,8 @@ namespace {`
`2645`	`2645`	`structResult->setIsCxxNonTrivial(isAddressOnly);`
`2646`	`2646`	`}`
`2647`	`2647`
`2648`		`- for (auto &getterAndSetter : Impl.GetterSetterMap[result]) {`
	`2648`	`+ auto gettersAndSetters = Impl.GetterSetterMap[result];`
	`2649`	`+ for (auto &getterAndSetter : gettersAndSetters) {`
`2649`	`2650`	`auto getter = getterAndSetter.second.first;`
`2650`	`2651`	`auto setter = getterAndSetter.second.second;`
`2651`	`2652`	`// We cannot make a computed property without a getter.`