This is an archive of the discontinued LLVM Phabricator instance.

Differential D51658

Fix a memory leak after rL341386.
ClosedPublic

Authored by hjyamauchi on Sep 4 2018, 2:12 PM.

Download Raw Diff

Details

Reviewers

davidxl

Commits

rGbd897a02a064: Fix a memory leak after rL341386.
rL341412: Fix a memory leak after rL341386.

Diff Detail

Repository: rL LLVM

Event Timeline

hjyamauchi created this revision.Sep 4 2018, 2:12 PM

Harbormaster completed remote builds in B22233: Diff 163914.Sep 4 2018, 2:12 PM

lgtm

This revision is now accepted and ready to land.Sep 4 2018, 2:18 PM

Rebased.

Harbormaster completed remote builds in B22235: Diff 163920.Sep 4 2018, 2:21 PM

Closed by commit rL341412: Fix a memory leak after rL341386. (authored by hjyamauchi). · Explain WhySep 4 2018, 2:29 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

trunk/

lib/

Transforms/

Instrumentation/

ControlHeightReduction.cpp

2 lines

Diff 163923

llvm/trunk/lib/Transforms/Instrumentation/ControlHeightReduction.cpp

Show First 20 Lines • Show All 1,747 Lines • ▼ Show 20 Lines	BranchInst CHR::createMergedBranch(BasicBlock PreEntryBlock,
ValueToValueMapTy &VMap) {		ValueToValueMapTy &VMap) {
BranchInst *OldBR = cast<BranchInst>(PreEntryBlock->getTerminator());		BranchInst *OldBR = cast<BranchInst>(PreEntryBlock->getTerminator());
assert(OldBR->isUnconditional() && OldBR->getSuccessor(0) == NewEntryBlock &&		assert(OldBR->isUnconditional() && OldBR->getSuccessor(0) == NewEntryBlock &&
"SplitBlock did not work correctly!");		"SplitBlock did not work correctly!");
assert(NewEntryBlock->getSinglePredecessor() == EntryBlock &&		assert(NewEntryBlock->getSinglePredecessor() == EntryBlock &&
"NewEntryBlock's only pred must be EntryBlock");		"NewEntryBlock's only pred must be EntryBlock");
assert(VMap.find(NewEntryBlock) != VMap.end() &&		assert(VMap.find(NewEntryBlock) != VMap.end() &&
"NewEntryBlock must have been copied");		"NewEntryBlock must have been copied");
OldBR->removeFromParent();
OldBR->dropAllReferences();		OldBR->dropAllReferences();
		OldBR->eraseFromParent();
// The true predicate is a placeholder. It will be replaced later in		// The true predicate is a placeholder. It will be replaced later in
// fixupBranchesAndSelects().		// fixupBranchesAndSelects().
BranchInst *NewBR = BranchInst::Create(NewEntryBlock,		BranchInst *NewBR = BranchInst::Create(NewEntryBlock,
cast<BasicBlock>(VMap[NewEntryBlock]),		cast<BasicBlock>(VMap[NewEntryBlock]),
ConstantInt::getTrue(F.getContext()));		ConstantInt::getTrue(F.getContext()));
PreEntryBlock->getInstList().push_back(NewBR);		PreEntryBlock->getInstList().push_back(NewBR);
assert(NewEntryBlock->getSinglePredecessor() == EntryBlock &&		assert(NewEntryBlock->getSinglePredecessor() == EntryBlock &&
"NewEntryBlock's only pred must be EntryBlock");		"NewEntryBlock's only pred must be EntryBlock");
▲ Show 20 Lines • Show All 253 Lines • Show Last 20 Lines