Reapply r41578 with proper fix

llvm-svn: 41680
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 084c846..8cfd5f9 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -244,6 +244,7 @@
     setExceptionPointerRegister(X86::EAX);
     setExceptionSelectorRegister(X86::EDX);
   }
+  setOperationAction(ISD::FRAME_TO_ARGS_OFFSET, MVT::i32, Custom);
   
   setOperationAction(ISD::ADJUST_TRAMP, MVT::i32,   Expand);
   setOperationAction(ISD::ADJUST_TRAMP, MVT::i64,   Expand);