From 4f5450742e97c7f98409be5a148edb9c862f1252 Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavel@labath.sk>
Date: Sun, 9 Sep 2018 08:42:00 +0000
Subject: [PATCH] Speculative fix for NetBSD bot for r341758

llvm-svn: 341759
---
 lldb/source/Host/common/NativeProcessProtocol.cpp    | 12 ++++++------
 .../Plugins/Process/Linux/NativeProcessLinux.cpp     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lldb/source/Host/common/NativeProcessProtocol.cpp b/lldb/source/Host/common/NativeProcessProtocol.cpp
index f2f721f4d847..da00da40186a 100644
--- a/lldb/source/Host/common/NativeProcessProtocol.cpp
+++ b/lldb/source/Host/common/NativeProcessProtocol.cpp
@@ -383,25 +383,25 @@ NativeProcessProtocol::GetSoftwareBreakpointTrapOpcode(size_t size_hint) {
 
   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(),
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index 3fa888c1cc49..d061f0d1bf21 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -1562,9 +1562,9 @@ NativeProcessLinux::GetSoftwareBreakpointTrapOpcode(size_t size_hint) {
   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!");