Fix for PR1632. EHSELECTION always produces a i32 value.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41712 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 60a9cd1def4e4a895c0e154987029bf167e9e8a1..62bcc32bb4ef653b83894c5377986e1c2bc2caac 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -2703,7 +2703,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
       }
 
       // Insert the EHSELECTION instruction.
-      SDVTList VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other);
+      SDVTList VTs = DAG.getVTList(MVT::i32, MVT::Other);
       SDOperand Ops[2];
       Ops[0] = getValue(I.getOperand(1));
       Ops[1] = getRoot();

diff --git a/test/CodeGen/X86/2007-09-03-X86-64-EhSelector.ll b/test/CodeGen/X86/2007-09-03-X86-64-EhSelector.ll
new file mode 100644 (file)
index 0000000..c3ba839
--- /dev/null
+++ b/test/CodeGen/X86/2007-09-03-X86-64-EhSelector.ll
@@ -0,0 +1,38 @@
+; RUN: llvm-as < %s | llc -march=x86-64 -enable-eh
+; PR1632
+
+define void @_Z1fv() {
+entry:
+       invoke void @_Z1gv( )
+                       to label %return unwind label %unwind
+
+unwind:                ; preds = %entry
+       br i1 false, label %eh_then, label %cleanup20
+
+eh_then:               ; preds = %unwind
+       invoke void @__cxa_end_catch( )
+                       to label %return unwind label %unwind10
+
+unwind10:              ; preds = %eh_then
+       %eh_select13 = tail call i32 (i8*, i8*, ...)* @llvm.eh.selector( i8* null, i8* bitcast (void ()* @__gxx_personality_v0 to i8*), i32 1 )         ; <i32> [#uses=2]
+       %tmp18 = icmp slt i32 %eh_select13, 0           ; <i1> [#uses=1]
+       br i1 %tmp18, label %filter, label %cleanup20
+
+filter:                ; preds = %unwind10
+       unreachable
+
+cleanup20:             ; preds = %unwind10, %unwind
+       %eh_selector.0 = phi i32 [ 0, %unwind ], [ %eh_select13, %unwind10 ]            ; <i32> [#uses=0]
+       ret void
+
+return:                ; preds = %eh_then, %entry
+       ret void
+}
+
+declare void @_Z1gv()
+
+declare i32 @llvm.eh.selector(i8*, i8*, ...)
+
+declare void @__gxx_personality_v0()
+
+declare void @__cxa_end_catch()