[llvm] r225047 - Reverting 225045 and 225043 and XFAIL multiline.ll on hexagon

[Colin LeMahieu]

Author: colinl
Date: Wed Dec 31 11:14:35 2014
New Revision: 225047

URL: http://llvm.org/viewvc/llvm-project?rev=225047&view=rev
Log:
Reverting 225045 and 225043 and XFAIL multiline.ll on hexagon

Modified:
    llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
    llvm/trunk/test/DebugInfo/multiline.ll

Modified: llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp?rev=225047&r1=225046&r2=225047&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp Wed Dec 31 11:14:35 2014
@@ -71,7 +71,7 @@ HexagonMCCodeEmitter::getMachineOpValue(
     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 {

Modified: llvm/trunk/test/DebugInfo/multiline.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/multiline.ll?rev=225047&r1=225046&r2=225047&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/multiline.ll (original)
+++ llvm/trunk/test/DebugInfo/multiline.ll Wed Dec 31 11:14:35 2014
@@ -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.