From 3fecad0d3e76bd534835bb7e46ff710e951aa68d Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Sun, 12 Feb 2017 22:02:20 +0000 Subject: [PATCH] testing llvm-svn: 294919 --- llvm/lib/Transforms/Scalar/NewGVN.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp index 47627937cfae..d95768216eb7 100644 --- a/llvm/lib/Transforms/Scalar/NewGVN.cpp +++ b/llvm/lib/Transforms/Scalar/NewGVN.cpp @@ -571,7 +571,7 @@ const Expression *NewGVN::createExpression(Instruction *I) { // numbers. Since all commutative instructions have two operands it is more // efficient to sort by hand rather than using, say, std::sort. assert(I->getNumOperands() == 2 && "Unsupported commutative instruction!"); - if (E->getOperand(0) > E->getOperand(1)) + if (shouldSwapOperands(E->getOperand(0), E->getOperand(1))) E->swapOperands(0, 1); } @@ -2425,6 +2425,7 @@ bool NewGVN::eliminateInstructions(Function &F) { // we will simplify an operation with all constants so that it doesn't matter // what order they appear in. unsigned int NewGVN::getRank(const Value *V) const { + assert(V && "What?"); if (isa(V)) return 0; else if (auto *A = dyn_cast(V))