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
commit882c7ee5105cd0104c433376a9de80969cda2019 (patch)
treef66cf3f6d43e82bd1f62469344a2a328a13f6505
parent3d1d1e1f2902fd479a9bcc392bbdb1e812c84214 (diff)
Merge from mainline.
Fix a compile error on compilers that still want a return value in a non-void function that calls abort. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_23@50982 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 307aeae1b2..4e3db7e9ea 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/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) {