From 91d4d93f94c09fbb33da6dd1d646da2a8cd49149 Mon Sep 17 00:00:00 2001 From: Adam Nemet Date: Tue, 29 Nov 2016 18:32:00 +0000 Subject: Revert "[GVN, OptDiag] Include the value that is forwarded in load elimination" This reverts commit r288047. Trying to see if the revert fixes a compiler crash during a stage2 LTO build with a GVN backtrace. llvm-svn: 288178 --- llvm/lib/Transforms/Scalar/GVN.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'llvm/lib/Transforms/Scalar/GVN.cpp') diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp index 4f66c5d1314..83a7efe14e9 100644 --- a/llvm/lib/Transforms/Scalar/GVN.cpp +++ b/llvm/lib/Transforms/Scalar/GVN.cpp @@ -1590,13 +1590,10 @@ bool GVN::PerformLoadPRE(LoadInst *LI, AvailValInBlkVect &ValuesPerBlock, return true; } -static void reportLoadElim(LoadInst *LI, Value *AvailableValue, - OptimizationRemarkEmitter *ORE) { - using namespace ore; +static void reportLoadElim(LoadInst *LI, OptimizationRemarkEmitter *ORE) { ORE->emit(OptimizationRemark(DEBUG_TYPE, "LoadElim", LI) - << "load of type " << NV("Type", LI->getType()) << " eliminated" - << setExtraArgs() << " in favor of " - << NV("InfavorOfValue", AvailableValue)); + << "load of type " << ore::NV("Type", LI->getType()) + << " eliminated"); } /// Attempt to eliminate a load whose dependencies are @@ -1669,7 +1666,7 @@ bool GVN::processNonLocalLoad(LoadInst *LI) { MD->invalidateCachedPointerInfo(V); markInstructionForDeletion(LI); ++NumGVNLoad; - reportLoadElim(LI, V, ORE); + reportLoadElim(LI, ORE); return true; } @@ -1816,7 +1813,7 @@ bool GVN::processLoad(LoadInst *L) { patchAndReplaceAllUsesWith(L, AvailableValue); markInstructionForDeletion(L); ++NumGVNLoad; - reportLoadElim(L, AvailableValue, ORE); + reportLoadElim(L, ORE); // Tell MDA to rexamine the reused pointer since we might have more // information after forwarding it. if (MD && AvailableValue->getType()->getScalarType()->isPointerTy()) -- cgit v1.2.3