Swift: consider lazy declaration emitted if the process lost in the race

AlexDenisov · AlexDenisov · commit 276fec39fc17 · 2023-03-01T15:42:44.000+01:00
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
@@ -123,6 +123,9 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
   auto trap = createTargetTrapDomain(state, filename, trapType);
   if (!trap) {
     // another process arrived first, nothing to do for us
+    if (lazyDeclaration) {
+      state.emittedDeclarations.insert(lazyDeclaration);
+    }
     return {};
   }
 
@@ -242,7 +245,7 @@ void codeql::extractExtractLazyDeclarations(SwiftExtractorState& state,
     extractLazy(state, compiler);
   }
   if (iteration >= upperBound) {
-    std::cerr << "Swift extractor reach upper bound while extracting lazy declarations\n";
+    std::cerr << "Swift extractor reached upper bound while extracting lazy declarations\n";
     abort();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,9 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(`
`123`	`123`	`auto trap = createTargetTrapDomain(state, filename, trapType);`
`124`	`124`	`if (!trap) {`
`125`	`125`	`// another process arrived first, nothing to do for us`
	`126`	`+ if (lazyDeclaration) {`
	`127`	`+ state.emittedDeclarations.insert(lazyDeclaration);`
	`128`	`+ }`
`126`	`129`	`return {};`
`127`	`130`	`}`
`128`	`131`
`@@ -242,7 +245,7 @@ void codeql::extractExtractLazyDeclarations(SwiftExtractorState& state,`
`242`	`245`	`extractLazy(state, compiler);`
`243`	`246`	`}`
`244`	`247`	`if (iteration >= upperBound) {`
`245`		`- std::cerr << "Swift extractor reach upper bound while extracting lazy declarations\n";`
	`248`	`+ std::cerr << "Swift extractor reached upper bound while extracting lazy declarations\n";`
`246`	`249`	`abort();`
`247`	`250`	`}`
`248`	`251`	`}`