[Lldb-commits] [lldb] r243953 - [debugserver] Fix "control may reach end of non-void function" warnings.

[Bruce Mitchener]

Author: brucem
Date: Mon Aug  3 23:01:16 2015
New Revision: 243953

URL: http://llvm.org/viewvc/llvm-project?rev=243953&view=rev
Log:
[debugserver] Fix "control may reach end of non-void function" warnings.

Reviewers: clayborg, jingham

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D11745

Modified:
    lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
    lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp

Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=243953&r1=243952&r2=243953&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp Mon Aug  3 23:01:16 2015
@@ -734,10 +734,11 @@ size_and_rw_bits(nub_size_t size, bool r
         return (0x3 << 2) | rw;
     case 8:
         return (0x2 << 2) | rw;
-    default:
-        assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
     }    
+    assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
+    return 0;
 }
+
 void
 DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write)
 {
@@ -849,9 +850,9 @@ DNBArchImplI386::GetWatchAddress(const D
         return debug_state.__dr2;
     case 3:
         return debug_state.__dr3;
-    default:
-        assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3");
     }
+    assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3");
+    return 0;
 }
 
 bool

Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=243953&r1=243952&r2=243953&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Mon Aug  3 23:01:16 2015
@@ -680,9 +680,9 @@ size_and_rw_bits(nub_size_t size, bool r
         return (0x3 << 2) | rw;
     case 8:
         return (0x2 << 2) | rw;
-    default:
-        assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
     }    
+    assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
+    return 0;
 }
 void
 DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write)
@@ -794,9 +794,9 @@ DNBArchImplX86_64::GetWatchAddress(const
         return debug_state.__dr2;
     case 3:
         return debug_state.__dr3;
-    default:
-        assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3");
     }
+    assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3");
+    return 0;
 }
 
 bool