From 97b4ac8c844e08ce1c4f4a73b85ba56775a2a6c5 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 11 Jul 2007 08:47:55 +0000 Subject: [PATCH] If assertions are not enabled, we should return False here. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@38535 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/BranchFolding.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 431bc4eca35..0fca9851794 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -430,13 +430,12 @@ static bool MergeCompare(const std::pair &p, else if (p.second->getNumber() > q.second->getNumber()) return false; else { - // _GLIBCXX_DEBUG needs to check strict weak ordering and it - // does it by doing a compare on the same object. -#ifdef _GLIBCXX_DEBUG - return(false); -#else + // _GLIBCXX_DEBUG checks strict weak ordering, which involves comparing + // an object with itself. +#ifndef _GLIBCXX_DEBUG assert(0 && "Predecessor appears twice"); #endif + return(false); } } -- 2.34.1