Skip to content

Fix a memory leak in SIL Analysis #8442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Fix a memory leak in SIL Analysis #8442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions include/swift/SILOptimizer/Analysis/Analysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ namespace swift {
/// meant to be overridden by subclasses.
virtual void verify(AnalysisTy *A) const {}

void deleteAllAnalysisProviders() {
for (auto D : Storage)
delete D.second;
Storage.clear();
}

public:
/// Returns an analysis provider for a specific function \p F.
AnalysisTy *get(SILFunction *F) {
Expand All @@ -183,7 +189,7 @@ namespace swift {

/// Invalidate all information in this analysis.
virtual void invalidate() override {
Storage.clear();
deleteAllAnalysisProviders();
}

/// Helper function to remove the analysis data for a function.
Expand Down Expand Up @@ -216,8 +222,7 @@ namespace swift {

FunctionAnalysisBase() {}
virtual ~FunctionAnalysisBase() {
for (auto D : Storage)
delete D.second;
deleteAllAnalysisProviders();
}
FunctionAnalysisBase(AnalysisKind K) : SILAnalysis(K), Storage() {}
FunctionAnalysisBase(const FunctionAnalysisBase &) = delete;
Expand Down