From f1df01d3ad3711298fd4972fc13e299a1ca47817 Mon Sep 17 00:00:00 2001 From: Johannes Doerfert Date: Mon, 19 Aug 2019 19:14:10 +0000 Subject: [PATCH] Re-apply fixed "[Attributor] Fix: Make sure we set the changed flag" This reverts commit cedd0d9a6e4b433e1cd6585d1d4d152eb5e60b11. Re-apply the original commit but make sure the variables are initialized (even if they are not used) so UBSan is not complaining. llvm-svn: 369294 --- lib/Transforms/IPO/Attributor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/IPO/Attributor.cpp b/lib/Transforms/IPO/Attributor.cpp index 4339a65f5e6..34fe5552a40 100644 --- a/lib/Transforms/IPO/Attributor.cpp +++ b/lib/Transforms/IPO/Attributor.cpp @@ -878,7 +878,7 @@ ChangeStatus AAReturnedValuesImpl::updateImpl(Attributor &A) { // The map in which we collect return values -> return instrs. decltype(ReturnedValues) &RetValsMap; // The flag to indicate a change. - bool Changed; + bool &Changed; // The return instrs we come from. SmallPtrSet RetInsts; }; @@ -906,9 +906,8 @@ ChangeStatus AAReturnedValuesImpl::updateImpl(Attributor &A) { // Callback for all "return intructions" live in the associated function. auto CheckReturnInst = [this, &VisitReturnedValue, &Changed](Instruction &I) { ReturnInst &Ret = cast(I); - RVState RVS({ReturnedValues, false, {}}); + RVState RVS({ReturnedValues, Changed, {}}); RVS.RetInsts.insert(&Ret); - Changed |= RVS.Changed; return VisitReturnedValue(*Ret.getReturnValue(), RVS); }; @@ -955,7 +954,8 @@ ChangeStatus AAReturnedValuesImpl::updateImpl(Attributor &A) { if (Argument *Arg = dyn_cast(RetVal)) { // Arguments are mapped to call site operands and we begin the traversal // again. - RVState RVS({NewRVsMap, false, RetValAAIt.second}); + bool Unused = false; + RVState RVS({NewRVsMap, Unused, RetValAAIt.second}); VisitReturnedValue(*CB->getArgOperand(Arg->getArgNo()), RVS); continue; } else if (isa(RetVal)) {