Date: Sat, 27 Aug 2016 11:51:08 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304906 - in projects/clang390-import: contrib/llvm/lib/Transforms/Scalar lib/clang/include/clang/Basic Message-ID: <201608271151.u7RBp87C027356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Aug 27 11:51:08 2016 New Revision: 304906 URL: https://svnweb.freebsd.org/changeset/base/304906 Log: Update llvm to release_39 branch r279689. Modified: projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp projects/clang390-import/lib/clang/include/clang/Basic/Version.inc Directory Properties: projects/clang390-import/contrib/llvm/ (props changed) projects/clang390-import/contrib/llvm/tools/clang/ (props changed) Modified: projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp Sat Aug 27 11:45:05 2016 (r304905) +++ projects/clang390-import/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp Sat Aug 27 11:51:08 2016 (r304906) @@ -1538,17 +1538,6 @@ static bool tryToReplaceWithConstant(SCC return true; } -static bool tryToReplaceInstWithConstant(SCCPSolver &Solver, Instruction *Inst, - bool shouldEraseFromParent) { - if (!tryToReplaceWithConstant(Solver, Inst)) - return false; - - // Delete the instruction. - if (shouldEraseFromParent) - Inst->eraseFromParent(); - return true; -} - // runSCCP() - Run the Sparse Conditional Constant Propagation algorithm, // and return true if the function was modified. // @@ -1597,8 +1586,9 @@ static bool runSCCP(Function &F, const D if (Inst->getType()->isVoidTy() || isa<TerminatorInst>(Inst)) continue; - if (tryToReplaceInstWithConstant(Solver, Inst, - true /* shouldEraseFromParent */)) { + if (tryToReplaceWithConstant(Solver, Inst)) { + if (isInstructionTriviallyDead(Inst)) + Inst->eraseFromParent(); // Hey, we just changed something! MadeChanges = true; ++NumInstRemoved; @@ -1789,10 +1779,9 @@ static bool runIPSCCP(Module &M, const D Instruction *Inst = &*BI++; if (Inst->getType()->isVoidTy()) continue; - if (tryToReplaceInstWithConstant( - Solver, Inst, - !isa<CallInst>(Inst) && - !isa<TerminatorInst>(Inst) /* shouldEraseFromParent */)) { + if (tryToReplaceWithConstant(Solver, Inst)) { + if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst)) + Inst->eraseFromParent(); // Hey, we just changed something! MadeChanges = true; ++IPNumInstRemoved; Modified: projects/clang390-import/lib/clang/include/clang/Basic/Version.inc ============================================================================== --- projects/clang390-import/lib/clang/include/clang/Basic/Version.inc Sat Aug 27 11:45:05 2016 (r304905) +++ projects/clang390-import/lib/clang/include/clang/Basic/Version.inc Sat Aug 27 11:51:08 2016 (r304906) @@ -7,4 +7,4 @@ #define CLANG_VENDOR "FreeBSD " -#define SVN_REVISION "279477" +#define SVN_REVISION "279689"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608271151.u7RBp87C027356>