<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 6, 2016 at 5:07 PM, Justin Bogner <span dir="ltr"><<a href="mailto:mail@justinbogner.com" target="_blank">mail@justinbogner.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class=""><div class="h5">David Majnemer via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> writes:<br>
> Author: majnemer<br>
> Date: Wed Jan 6 13:26:30 2016<br>
> New Revision: 256965<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=256965&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=256965&view=rev</a><br>
> Log:<br>
> [WinEH] Remove calculateCatchReturnSuccessorColors<br>
><br>
> The functionality that calculateCatchReturnSuccessorColors provides was<br>
> once non-trivial: it was a computation layered on top of funclet<br>
> coloring.<br>
><br>
> These days, LLVM IR directly encodes what<br>
> calculateCatchReturnSuccessorColors computed, obsoleting the need for<br>
> it.<br>
><br>
> No functionality change is intended.<br>
><br>
> Modified:<br>
> llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h<br>
> llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp<br>
> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp<br>
> llvm/trunk/lib/CodeGen/WinEHPrepare.cpp<br>
><br>
> Modified: llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h?rev=256965&r1=256964&r2=256965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h?rev=256965&r1=256964&r2=256965&view=diff</a><br>
> ==============================================================================<br>
><br>
> --- llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h (original)<br>
> +++ llvm/trunk/include/llvm/CodeGen/WinEHFuncInfo.h Wed Jan 6 13:26:30 2016<br>
> @@ -93,8 +93,6 @@ struct WinEHFuncInfo {<br>
> DenseMap<const Instruction *, int> EHPadStateMap;<br>
> DenseMap<const FuncletPadInst *, int> FuncletBaseStateMap;<br>
> DenseMap<const InvokeInst *, int> InvokeStateMap;<br>
> - DenseMap<const CatchReturnInst *, const BasicBlock *><br>
> - CatchRetSuccessorColorMap;<br>
> DenseMap<MCSymbol *, std::pair<int, MCSymbol *>> LabelToStateMap;<br>
> SmallVector<CxxUnwindMapEntry, 4> CxxUnwindMap;<br>
> SmallVector<WinEHTryBlockMapEntry, 4> TryBlockMap;<br>
> @@ -125,8 +123,5 @@ void calculateSEHStateNumbers(const Func<br>
> WinEHFuncInfo &FuncInfo);<br>
><br>
> void calculateClrEHStateNumbers(const Function *Fn, WinEHFuncInfo &FuncInfo);<br>
> -<br>
> -void calculateCatchReturnSuccessorColors(const Function *Fn,<br>
> - WinEHFuncInfo &FuncInfo);<br>
> }<br>
> #endif // LLVM_CODEGEN_WINEHFUNCINFO_H<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp?rev=256965&r1=256964&r2=256965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp?rev=256965&r1=256964&r2=256965&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp Wed Jan 6 13:26:30 2016<br>
> @@ -271,6 +271,8 @@ void FunctionLoweringInfo::set(const Fun<br>
> }<br>
> }<br>
><br>
> + WinEHFuncInfo &EHInfo = *MF->getWinEHFuncInfo();<br>
> +<br>
> // Mark landing pad blocks.<br>
> SmallVector<const LandingPadInst *, 4> LPads;<br>
> for (BB = Fn->begin(); BB != EB; ++BB) {<br>
> @@ -289,7 +291,6 @@ void FunctionLoweringInfo::set(const Fun<br>
> return;<br>
><br>
> // Calculate state numbers if we haven't already.<br>
> - WinEHFuncInfo &EHInfo = *MF->getWinEHFuncInfo();<br>
<br>
</div></div>Why are you moving this call before the early return? Ubsan complains<br>
that we're binding a nullptr to a reference now, since<br>
MF->getWinEHFuncInfo() will be null when !isFuncletEHPersonality(...)<br></blockquote><div><br></div><div>Sorry, this change was spurious. Fixed in r257028.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class=""><div class="h5"><br>
> if (Personality == EHPersonality::MSVC_CXX)<br>
> calculateWinCXXEHStateNumbers(&fn, EHInfo);<br>
> else if (isAsynchronousEHPersonality(Personality))<br>
> @@ -297,8 +298,6 @@ void FunctionLoweringInfo::set(const Fun<br>
> else if (Personality == EHPersonality::CoreCLR)<br>
> calculateClrEHStateNumbers(&fn, EHInfo);<br>
><br>
> - calculateCatchReturnSuccessorColors(&fn, EHInfo);<br>
> -<br>
> // Map all BB references in the WinEH data to MBBs.<br>
> for (WinEHTryBlockMapEntry &TBME : EHInfo.TryBlockMap) {<br>
> for (WinEHHandlerType &H : TBME.HandlerArray) {<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=256965&r1=256964&r2=256965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=256965&r1=256964&r2=256965&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Jan 6 13:26:30 2016<br>
> @@ -1205,8 +1205,13 @@ void SelectionDAGBuilder::visitCatchRet(<br>
> // Figure out the funclet membership for the catchret's successor.<br>
> // This will be used by the FuncletLayout pass to determine how to order the<br>
> // BB's.<br>
> - WinEHFuncInfo *EHInfo = DAG.getMachineFunction().getWinEHFuncInfo();<br>
> - const BasicBlock *SuccessorColor = EHInfo->CatchRetSuccessorColorMap[&I];<br>
> + // A 'catchret' returns to the outer scope's color.<br>
> + Value *ParentPad = I.getParentPad();<br>
> + const BasicBlock *SuccessorColor;<br>
> + if (isa<ConstantTokenNone>(ParentPad))<br>
> + SuccessorColor = &FuncInfo.Fn->getEntryBlock();<br>
> + else<br>
> + SuccessorColor = cast<Instruction>(ParentPad)->getParent();<br>
> assert(SuccessorColor && "No parent funclet for catchret!");<br>
> MachineBasicBlock *SuccessorColorMBB = FuncInfo.MBBMap[SuccessorColor];<br>
> assert(SuccessorColorMBB && "No MBB for SuccessorColor!");<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/WinEHPrepare.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/WinEHPrepare.cpp?rev=256965&r1=256964&r2=256965&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/WinEHPrepare.cpp?rev=256965&r1=256964&r2=256965&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/CodeGen/WinEHPrepare.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/WinEHPrepare.cpp Wed Jan 6 13:26:30 2016<br>
> @@ -664,24 +664,6 @@ void WinEHPrepare::colorFunclets(Functio<br>
> }<br>
> }<br>
><br>
> -void llvm::calculateCatchReturnSuccessorColors(const Function *Fn,<br>
> - WinEHFuncInfo &FuncInfo) {<br>
> - for (const BasicBlock &BB : *Fn) {<br>
> - const auto *CatchRet = dyn_cast<CatchReturnInst>(BB.getTerminator());<br>
> - if (!CatchRet)<br>
> - continue;<br>
> - // A 'catchret' returns to the outer scope's color.<br>
> - Value *ParentPad = CatchRet->getParentPad();<br>
> - const BasicBlock *Color;<br>
> - if (isa<ConstantTokenNone>(ParentPad))<br>
> - Color = &Fn->getEntryBlock();<br>
> - else<br>
> - Color = cast<Instruction>(ParentPad)->getParent();<br>
> - // Record the catchret successor's funclet membership.<br>
> - FuncInfo.CatchRetSuccessorColorMap[CatchRet] = Color;<br>
> - }<br>
> -}<br>
> -<br>
> void WinEHPrepare::demotePHIsOnFunclets(Function &F) {<br>
> // Strip PHI nodes off of EH pads.<br>
> SmallVector<PHINode *, 16> PHINodes;<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div>