Fix build failure on lldb-amd64-ninja-freebsd11 error caused by rL283474

[valentinagiusti]

applied clang-format

[valentinagiusti]

cleaned up code

[emaste]

Not tested, but looks reasonable to me.

I think we should avoid siginfo_t altogether here in order to support cross-debugging, but that's for a different change.

lldb/trunk/source/Plugins/Process/POSIX/CrashReason.h

enum class CrashReason {
   eFloatDivideByZero,
   eFloatOverflow,
   eFloatUnderflow,
   eFloatInexactResult,
   eFloatInvalidOperation,
   eFloatSubscriptRange
 };
 
+std::string GetCrashReasonString(CrashReason reason, lldb::addr_t fault_addr);
 std::string GetCrashReasonString(CrashReason reason, const siginfo_t &info);
 
 const char *CrashReasonAsString(CrashReason reason);
 
 CrashReason GetCrashReason(const siginfo_t &info);
 
 #endif // #ifndef liblldb_CrashReason_H_

lldb/trunk/source/Plugins/Process/POSIX/CrashReason.cpp

CrashReason GetCrashReasonForSIGBUS(const siginfo_t &info) {
   assert(false && "unexpected si_code for SIGBUS");
   return CrashReason::eInvalidCrashReason;
 }
 }
 
 std::string GetCrashReasonString(CrashReason reason, const siginfo_t &info) {
   std::string str;
 
+// make sure that siginfo_t has the bound fields available.
+#if defined(si_lower) && defined(si_upper)
+  if (reason == CrashReason::eBoundViolation) {
+    str = "signal SIGSEGV";
+    AppendBounds(str, reinterpret_cast<lldb::addr_t>(info.si_lower),
+                 reinterpret_cast<lldb::addr_t>(info.si_upper),
+                 reinterpret_cast<lldb::addr_t>(info.si_addr));
+    return str;
+  }
+#endif
+
+  return GetCrashReasonString(reason,
+                              reinterpret_cast<lldb::addr_t>(info.si_addr));
+}
+
+std::string GetCrashReasonString(CrashReason reason, lldb::addr_t fault_addr) {
+  std::string str;
+
   switch (reason) {
   default:
     assert(false && "invalid CrashReason");
     break;
 
   case CrashReason::eInvalidAddress:
     str = "signal SIGSEGV: invalid address";
-    AppendFaultAddr(str, reinterpret_cast<lldb::addr_t>(info.si_addr));
+    AppendFaultAddr(str, fault_addr);
     break;
   case CrashReason::ePrivilegedAddress:
     str = "signal SIGSEGV: address access protected";
-    AppendFaultAddr(str, reinterpret_cast<lldb::addr_t>(info.si_addr));
+    AppendFaultAddr(str, fault_addr);
     break;
   case CrashReason::eBoundViolation:
-    str = "signal SIGSEGV";
-// Make sure that siginfo_t has the bound fields available.
-#if defined(si_lower) && defined(si_upper)
-    AppendBounds(str, reinterpret_cast<lldb::addr_t>(info.si_lower),
-                     reinterpret_cast<lldb::addr_t>(info.si_upper),
-                     reinterpret_cast<lldb::addr_t>(info.si_addr));
-#endif
+    str = "signal SIGSEGV: bound violation";
     break;
   case CrashReason::eIllegalOpcode:
     str = "signal SIGILL: illegal instruction";
     break;
   case CrashReason::eIllegalOperand:
     str = "signal SIGILL: illegal instruction operand";
     break;
   case CrashReason::eIllegalAddressingMode: