aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2008-05-12 18:23:35 +0000
committerTanya Lattner <tonic@nondot.org>2008-05-12 18:23:35 +0000
commit4231f713b9c376b7c54e5d8806433189dfb98c24 (patch)
tree0df9f8af77e7eb620b1aa2ae7732676dad857491
parent1621e89545a6d6c48e298cc40b7dc24bd50916dd (diff)
downloadllvm-4231f713b9c376b7c54e5d8806433189dfb98c24.zip
llvm-4231f713b9c376b7c54e5d8806433189dfb98c24.tar.gz
llvm-4231f713b9c376b7c54e5d8806433189dfb98c24.tar.bz2
Merge from mainline.
Fix a compile error on compilers that still want a return value in a non-void function that calls abort. llvm-svn: 50982
-rw-r--r--llvm/lib/Target/X86/X86ISelLowering.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 307aeae..4e3db7e 100644
--- 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) {