From 13d10096e1e2c1185c89d94ca69827a737550afd Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 17 Dec 2008 23:31:20 +0000 Subject: [PATCH] Temporarily revert r61027. It was causing a bootstrap failure in "release" mode with everyone's favorite error messages: Comparing stages 2 and 3 warning: ./cc1-checksum.o differs warning: ./cc1plus-checksum.o differs Bootstrap comparison failure! ./c-decl.o differs ./cp/decl.o differs ./df-core.o differs ./gcc.o differs ./i386.o differs ./stor-layout.o differs ./tree-pretty-print.o differs ./tree.o differs make[2]: *** [compare] Error 1 make[1]: *** [stage3-bubble] Error 2 See PR3227. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61169 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/GVN.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp index 75584decf04..36624249238 100644 --- a/lib/Transforms/Scalar/GVN.cpp +++ b/lib/Transforms/Scalar/GVN.cpp @@ -48,7 +48,7 @@ STATISTIC(NumPRELoad, "Number of loads PRE'd"); static cl::opt EnablePRE("enable-pre", cl::init(true), cl::Hidden); -cl::opt EnableLoadPRE("enable-load-pre", cl::init(true)); +cl::opt EnableLoadPRE("enable-load-pre"/*, cl::init(true)*/); //===----------------------------------------------------------------------===// // ValueTable Class @@ -957,11 +957,6 @@ bool GVN::processNonLocalLoad(LoadInst *LI, if (Deps.size() > 100) return false; - // If we had a phi translation failure, we'll have a single entry which is a - // clobber in the current block. Reject this early. - if (Deps.size() == 1 && Deps[0].second.isClobber()) - return false; - // Filter out useless results (non-locals, etc). Keep track of the blocks // where we have a value available in repl, also keep track of whether we see // dependencies that produce an unknown value for the load (such as a call -- 2.34.1