averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a use-after-free caused by creating DerivedFileUnit on the fly

Browse Source 
Sema was creating DerivedFileUnit on the fly, while something else is iterating
over FileUnits in the module.  The fix is to create DerivedFileUnit in advance.
This change immediately uncovered a lot of code that assumed that the module
consists of a single FileUnit at certain conditions.  This patch also fixes
that code (SourceKit patch is separate, not sending it).

The test change is because now operator == on NSObjects is correctly recognised
as coming from a system module.

rdar://16153700, rdar://16227621, possibly rdar://16049613


Swift SVN r14692
This commit is contained in:
Dmitri Hrybenko
2014-03-05 22:24:25 +00:00
parent f8a29859e5
commit cd48638f9a
5 changed files with 99 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/DerivedConformanceRawRepresentable.cpp
View File

@@ -44,10 +44,10 @@ void DerivedConformance::_insertOperatorDecl(NominalTypeDecl *scope,
// Find the module.
auto &C = scope->getASTContext();
auto mod = scope->getModuleContext();
// Add it to the module in a DerivedFileUnit.
mod->addFile(*new (C) DerivedFileUnit(*mod, cast<FuncDecl>(member)));
mod->getDerivedFileUnit().addDerivedDecl(cast<FuncDecl>(member));
// Add it as a derived global decl to the nominal type.
auto oldDerived = scope->getDerivedGlobalDecls();
auto oldSize = oldDerived.size();