Merge from mainline.

tlattner · tlattner · commit 4231f713b9c3 · 2008-05-12T18:23:35.000Z
Fix a compile error on compilers that still want a return value
in a non-void function that calls abort.

llvm-svn: 50982
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -4987,6 +4987,7 @@ SDOperand X86TargetLowering::LowerVAARG(SDOperand Op, SelectionDAG &DAG) {
 
   assert(0 && "VAArgInst is not yet implemented for x86-64!");
   abort();
+  return SDOperand();
 }
 
 SDOperand X86TargetLowering::LowerVACOPY(SDOperand Op, SelectionDAG &DAG) {

Original file line number	Diff line number	Diff line change
`@@ -4987,6 +4987,7 @@ SDOperand X86TargetLowering::LowerVAARG(SDOperand Op, SelectionDAG &DAG) {`
`4987`	`4987`
`4988`	`4988`	`assert(0 && "VAArgInst is not yet implemented for x86-64!");`
`4989`	`4989`	`abort();`
	`4990`	`+ return SDOperand();`
`4990`	`4991`	`}`
`4991`	`4992`
`4992`	`4993`	`SDOperand X86TargetLowering::LowerVACOPY(SDOperand Op, SelectionDAG &DAG) {`