[Lldb-commits] [lldb] r341759 - Speculative fix for NetBSD bot for r341758

[Pavel Labath via lldb-commits]

Author: labath
Date: Sun Sep  9 01:42:00 2018
New Revision: 341759

URL: http://llvm.org/viewvc/llvm-project?rev=341759&view=rev
Log:
Speculative fix for NetBSD bot for r341758

Modified:
    lldb/trunk/source/Host/common/NativeProcessProtocol.cpp
    lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp

Modified: lldb/trunk/source/Host/common/NativeProcessProtocol.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/NativeProcessProtocol.cpp?rev=341759&r1=341758&r2=341759&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/NativeProcessProtocol.cpp (original)
+++ lldb/trunk/source/Host/common/NativeProcessProtocol.cpp Sun Sep  9 01:42:00 2018
@@ -383,25 +383,25 @@ NativeProcessProtocol::GetSoftwareBreakp
 
   switch (GetArchitecture().GetMachine()) {
   case llvm::Triple::aarch64:
-    return g_aarch64_opcode;
+    return llvm::makeArrayRef(g_aarch64_opcode);
 
   case llvm::Triple::x86:
   case llvm::Triple::x86_64:
-    return g_i386_opcode;
+    return llvm::makeArrayRef(g_i386_opcode);
 
   case llvm::Triple::mips:
   case llvm::Triple::mips64:
-    return g_mips64_opcode;
+    return llvm::makeArrayRef(g_mips64_opcode);
 
   case llvm::Triple::mipsel:
   case llvm::Triple::mips64el:
-    return g_mips64el_opcode;;
+    return llvm::makeArrayRef(g_mips64el_opcode);
 
   case llvm::Triple::systemz:
-    return g_s390x_opcode;
+    return llvm::makeArrayRef(g_s390x_opcode);
 
   case llvm::Triple::ppc64le:
-    return g_ppc64le_opcode;
+    return llvm::makeArrayRef(g_ppc64le_opcode);
 
   default:
     return llvm::createStringError(llvm::inconvertibleErrorCode(),

Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=341759&r1=341758&r2=341759&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Sun Sep  9 01:42:00 2018
@@ -1562,9 +1562,9 @@ NativeProcessLinux::GetSoftwareBreakpoin
   case llvm::Triple::arm:
     switch (size_hint) {
     case 2:
-      return g_thumb_opcode;
+      return llvm::makeArrayRef(g_thumb_opcode);
     case 4:
-      return g_arm_opcode;
+      return llvm::makeArrayRef(g_arm_opcode);
     default:
       return llvm::createStringError(llvm::inconvertibleErrorCode(),
                                      "Unrecognised trap opcode size hint!");