Skip to content

Cross-module-optimization: fix a use-after-free ASAN crash #28587

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
Dec 5, 2019
Merged

Cross-module-optimization: fix a use-after-free ASAN crash #28587

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
8 changes: 6 additions & 2 deletions lib/SILOptimizer/IPO/CrossModuleSerializationSetup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class InstructionVisitor : public SILCloner<InstructionVisitor> {

private:
CrossModuleSerializationSetup &CMS;
SILInstruction *result = nullptr;

public:
InstructionVisitor(SILFunction *F, CrossModuleSerializationSetup &CMS) :
Expand All @@ -122,8 +123,8 @@ class InstructionVisitor : public SILCloner<InstructionVisitor> {
}

void postProcess(SILInstruction *Orig, SILInstruction *Cloned) {
SILInstruction::destroy(Cloned);
Orig->getFunction()->getModule().deallocateInst(Cloned);
result = Cloned;
SILCloner<InstructionVisitor>::postProcess(Orig, Cloned);
}

SILValue getMappedValue(SILValue Value) { return Value; }
Expand All @@ -133,6 +134,9 @@ class InstructionVisitor : public SILCloner<InstructionVisitor> {
static void visitInst(SILInstruction *I, CrossModuleSerializationSetup &CMS) {
InstructionVisitor visitor(I->getFunction(), CMS);
visitor.visit(I);

SILInstruction::destroy(visitor.result);
CMS.M.deallocateInst(visitor.result);
}
};

Expand Down