From f5943bd9a9749ff73256634d14c258264b72c7dc Mon Sep 17 00:00:00 2001
From: Colin LeMahieu <colinl@codeaurora.org>
Date: Wed, 31 Dec 2014 17:14:35 +0000
Subject: [PATCH] Reverting 225045 and 225043 and XFAIL multiline.ll on hexagon

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225047 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp | 2 +-
 test/DebugInfo/multiline.ll                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp b/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
index 3f978d8ae53..4471977ab49 100644
--- a/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
+++ b/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
@@ -71,7 +71,7 @@ HexagonMCCodeEmitter::getMachineOpValue(MCInst const &MI, MCOperand const &MO,
     return MCT.getRegisterInfo()->getEncodingValue(MO.getReg());
   if (MO.isImm())
     return static_cast<unsigned>(MO.getImm());
-  return 0;
+  llvm_unreachable("Only Immediates and Registers implemented right now");
 }
 
 MCSubtargetInfo const &HexagonMCCodeEmitter::getSubtargetInfo() const {
diff --git a/test/DebugInfo/multiline.ll b/test/DebugInfo/multiline.ll
index 59c7aba8186..d01f2c1ad76 100644
--- a/test/DebugInfo/multiline.ll
+++ b/test/DebugInfo/multiline.ll
@@ -1,5 +1,6 @@
 ; RUN: llc -filetype=asm -asm-verbose=0 -O0 < %s | FileCheck %s
 ; RUN: llc -filetype=obj -O0 < %s | llvm-dwarfdump -debug-dump=line - | FileCheck %s --check-prefix=INT
+; XFAIL: hexagon
 
 ; Check that the assembly output properly handles is_stmt changes. And since
 ; we're testing anyway, check the integrated assembler too.