From: Bill Wendling <isanbard@gmail.com>
Date: Thu, 27 Nov 2008 08:00:12 +0000 (+0000)
Subject: Get rid of bogus "control may reach end of non-void function ‘...’ being
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7c0d94465feaf09281ca8088f2872583a0c7d84;p=oota-llvm.git

Get rid of bogus "control may reach end of non-void function ‘...’ being
inlined" message.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60165 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp
index a65e55afb56..4da71441983 100644
--- a/lib/Support/APFloat.cpp
+++ b/lib/Support/APFloat.cpp
@@ -2290,8 +2290,8 @@ APFloat::convertFromString(const char *p, roundingMode rounding_mode)
 
   if(p[0] == '0' && (p[1] == 'x' || p[1] == 'X'))
     return convertFromHexadecimalString(p + 2, rounding_mode);
-  else
-    return convertFromDecimalString(p, rounding_mode);
+
+  return convertFromDecimalString(p, rounding_mode);
 }
 
 /* Write out a hexadecimal representation of the floating point value