From 8e52bcc59106ea6221c607ab735215ca8d7a4a44 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 24 Jun 2014 00:26:08 +0000 Subject: [PATCH] Support: Return ScaledNumbers::MaxScale from getQuotient() Return MaxScale now that it's available. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211559 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ScaledNumber.h | 4 ++-- unittests/Support/ScaledNumberTest.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/llvm/Support/ScaledNumber.h b/include/llvm/Support/ScaledNumber.h index b12f347806d..e7c329f7bff 100644 --- a/include/llvm/Support/ScaledNumber.h +++ b/include/llvm/Support/ScaledNumber.h @@ -148,7 +148,7 @@ std::pair divide32(uint32_t Dividend, uint32_t Divisor); /// /// Implemented with one 64-bit integer divide/remainder pair. /// -/// Returns \c (DigitsT_MAX, INT16_MAX) for divide-by-zero (0 for 0/0). +/// Returns \c (DigitsT_MAX, MaxScale) for divide-by-zero (0 for 0/0). template std::pair getQuotient(DigitsT Dividend, DigitsT Divisor) { static_assert(!std::numeric_limits::is_signed, "expected unsigned"); @@ -159,7 +159,7 @@ std::pair getQuotient(DigitsT Dividend, DigitsT Divisor) { if (!Dividend) return std::make_pair(0, 0); if (!Divisor) - return std::make_pair(std::numeric_limits::max(), INT16_MAX); + return std::make_pair(std::numeric_limits::max(), MaxScale); if (getWidth() == 64) return divide64(Dividend, Divisor); diff --git a/unittests/Support/ScaledNumberTest.cpp b/unittests/Support/ScaledNumberTest.cpp index 48527e5d1bb..2565873ea8d 100644 --- a/unittests/Support/ScaledNumberTest.cpp +++ b/unittests/Support/ScaledNumberTest.cpp @@ -137,8 +137,8 @@ TEST(ScaledNumberHelpersTest, getQuotient) { EXPECT_EQ(SP32(0, 0), getQuotient32(0, 0)); EXPECT_EQ(SP32(0, 0), getQuotient32(0, 1)); EXPECT_EQ(SP32(0, 0), getQuotient32(0, 73)); - EXPECT_EQ(SP32(UINT32_MAX, INT16_MAX), getQuotient32(1, 0)); - EXPECT_EQ(SP32(UINT32_MAX, INT16_MAX), getQuotient32(6, 0)); + EXPECT_EQ(SP32(UINT32_MAX, MaxScale), getQuotient32(1, 0)); + EXPECT_EQ(SP32(UINT32_MAX, MaxScale), getQuotient32(6, 0)); // Powers of two. EXPECT_EQ(SP32(1u << 31, -31), getQuotient32(1, 1)); @@ -171,8 +171,8 @@ TEST(ScaledNumberHelpersTest, getQuotient) { EXPECT_EQ(SP64(0, 0), getQuotient64(0, 0)); EXPECT_EQ(SP64(0, 0), getQuotient64(0, 1)); EXPECT_EQ(SP64(0, 0), getQuotient64(0, 73)); - EXPECT_EQ(SP64(UINT64_MAX, INT16_MAX), getQuotient64(1, 0)); - EXPECT_EQ(SP64(UINT64_MAX, INT16_MAX), getQuotient64(6, 0)); + EXPECT_EQ(SP64(UINT64_MAX, MaxScale), getQuotient64(1, 0)); + EXPECT_EQ(SP64(UINT64_MAX, MaxScale), getQuotient64(6, 0)); // Powers of two. EXPECT_EQ(SP64(1, 0), getQuotient64(1, 1));