D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-13 19:33:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed cases where the destructor is called on an uninitialized temporary

Browse Source
This commit is contained in:
Alexey Prokhin
2013-07-10 18:15:05 +04:00
parent cf32ced6a9
commit 8b783da523
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gen/toir.cpp
View File

@@ -115,33 +115,40 @@ DValue *Expression::toElemDtor(IRState *p)
apply(&CallDestructors::searchVarsWithDesctructors, &edtors);
if (!edtors.empty()) {
// create finally block that calls destructors on temporaries
CallDestructors *callDestructors = new CallDestructors(edtors);
if (op == TOKcall) {
// create finally block that calls destructors on temporaries
CallDestructors *callDestructors = new CallDestructors(edtors);
// create landing pad
llvm::BasicBlock *oldend = p->scopeend();
llvm::BasicBlock *landingpadbb = llvm::BasicBlock::Create(gIR->context(), "landingpad", p->topfunc(), oldend);
// create landing pad
llvm::BasicBlock *oldend = p->scopeend();
llvm::BasicBlock *landingpadbb = llvm::BasicBlock::Create(gIR->context(), "landingpad", p->topfunc(), oldend);
// set up the landing pad
IRLandingPad& pad = gIR->func()->gen->landingPadInfo;
pad.addFinally(callDestructors);
pad.push(landingpadbb);
// set up the landing pad
IRLandingPad &pad = gIR->func()->gen->landingPadInfo;
pad.addFinally(callDestructors);
pad.push(landingpadbb);
// evaluate the expression
DValue *val = toElem(p);
// evaluate the expression
DValue *val = toElem(p);
// build the landing pad
llvm::BasicBlock *oldbb = p->scopebb();
pad.pop();
// build the landing pad
llvm::BasicBlock *oldbb = p->scopebb();
pad.pop();
// call the destructors
gIR->scope() = IRScope(oldbb, oldend);
callDestructors->toIR();
delete callDestructors;
return val;
} else {
return toElem(p);
// call the destructors
gIR->scope() = IRScope(oldbb, oldend);
callDestructors->toIR();
delete callDestructors;
return val;
} else {
DValue *val = toElem(p);
CallDestructors(edtors).toIR();
return val;
}
}
return toElem(p);
}
//////////////////////////////////////////////////////////////////////////////////////////

2
tests/d2/dmd-testsuite

Submodule tests/d2/dmd-testsuite updated: 48e8b097f3...e8c14b05ca