This is an archive of the discontinued LLVM Phabricator instance.

Differential D45648

[WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call
ClosedPublic

Authored by aheejin on Apr 13 2018, 4:53 PM.

Details

Reviewers
yurydelendik
Commits
rG92401cc1cf42: [WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call
rL330079: [WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call
Summary

InsertPos is within the bacic block Header, so findDebugLoc() should be called on not MBB but Header instead.

Diff Detail

Repository
rL LLVM

Event Timeline

aheejin created this revision.Apr 13 2018, 4:53 PM
Herald added subscribers: llvm-commits, JDevlieghere, sunfish and 5 others. · View Herald TranscriptApr 13 2018, 4:53 PM
Harbormaster completed remote builds in B17081: Diff 142494.Apr 13 2018, 4:54 PM
aheejin edited the summary of this revision. (Show Details)Apr 13 2018, 4:54 PM
aheejin edited the summary of this revision. (Show Details)
aheejin edited the summary of this revision. (Show Details)
aheejin updated this revision to Diff 142495.Apr 13 2018, 4:55 PM

comment fix

aheejin edited the summary of this revision. (Show Details)Apr 13 2018, 4:55 PM
aheejin retitled this revision from [WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call to [WebAssembly] Fix bugs in MachineBasicBlock::findDebugLoc() call.
Harbormaster completed remote builds in B17082: Diff 142495.Apr 13 2018, 4:57 PM
aheejin retitled this revision from [WebAssembly] Fix bugs in MachineBasicBlock::findDebugLoc() call to [WebAssembly] Fix bugs in MachineBasicBlock::findDebugLoc() calls.Apr 13 2018, 4:57 PM
aheejin edited the summary of this revision. (Show Details)Apr 13 2018, 5:06 PM
aheejin edited the summary of this revision. (Show Details)
aheejin updated this revision to Diff 142497.Apr 13 2018, 5:10 PM

Delete findPrevDebugLoc() call and leave only Header bugfix

Harbormaster completed remote builds in B17083: Diff 142497.Apr 13 2018, 5:10 PM
aheejin retitled this revision from [WebAssembly] Fix bugs in MachineBasicBlock::findDebugLoc() calls to [WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call.Apr 13 2018, 5:10 PM
aheejin edited the summary of this revision. (Show Details)
yurydelendik accepted this revision.Apr 13 2018, 5:14 PM

This makes sense. Thank you for the patch.

This revision is now accepted and ready to land.Apr 13 2018, 5:14 PM
Closed by commit rL330079: [WebAssembly] Fix a bug in MachineBasicBlock::findDebugLoc() call (authored by aheejin). · Explain WhyApr 13 2018, 5:15 PM
This revision was automatically updated to reflect the committed changes.
aheejin mentioned this in D45711: [WebAssembly] Add an assertion for an invalid CFG.Apr 16 2018, 5:35 PM
aheejin mentioned this in rL330217: [WebAssembly] Add an assertion for an invalid CFG.Apr 17 2018, 2:22 PM

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
WebAssembly/
7 lines

Diff 142498

llvm/trunk/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines while (InsertPos != Header->begin() &&
WebAssembly::isChild(*std::prev(InsertPos), MFI) && WebAssembly::isChild(*std::prev(InsertPos), MFI) &&
std::prev(InsertPos)->getOpcode() != WebAssembly::LOOP && std::prev(InsertPos)->getOpcode() != WebAssembly::LOOP &&
std::prev(InsertPos)->getOpcode() != WebAssembly::END_BLOCK && std::prev(InsertPos)->getOpcode() != WebAssembly::END_BLOCK &&
std::prev(InsertPos)->getOpcode() != WebAssembly::END_LOOP) std::prev(InsertPos)->getOpcode() != WebAssembly::END_LOOP)
--InsertPos; --InsertPos;
} }
// Add the BLOCK. // Add the BLOCK.
MachineInstr *Begin = BuildMI(*Header, InsertPos, MBB.findDebugLoc(InsertPos), MachineInstr *Begin =
BuildMI(*Header, InsertPos, Header->findDebugLoc(InsertPos),
TII.get(WebAssembly::BLOCK)) TII.get(WebAssembly::BLOCK))
.addImm(int64_t(WebAssembly::ExprType::Void)); .addImm(int64_t(WebAssembly::ExprType::Void));
// Mark the end of the block. // Mark the end of the block.
InsertPos = MBB.begin(); InsertPos = MBB.begin();
while (InsertPos != MBB.end() && while (InsertPos != MBB.end() &&
InsertPos->getOpcode() == WebAssembly::END_LOOP && InsertPos->getOpcode() == WebAssembly::END_LOOP &&
LoopTops[&*InsertPos]->getParent()->getNumber() >= Header->getNumber()) LoopTops[&*InsertPos]->getParent()->getNumber() >= Header->getNumber())
++InsertPos; ++InsertPos;
MachineInstr *End = BuildMI(MBB, InsertPos, MBB.findPrevDebugLoc(InsertPos), MachineInstr *End = BuildMI(MBB, InsertPos, MBB.findPrevDebugLoc(InsertPos),
▲ Show 20 Lines • Show All 220 Lines • Show Last 20 Lines