[PATCH] D45938: Improves x86 interrupt error message on argument type error

[Nathan Ringo via Phabricator via llvm-commits]

remexre updated this revision to Diff 143597.
remexre added a comment.

Changes variable names, readds Ins.size() check.


Repository:
  rL LLVM

https://reviews.llvm.org/D45938

Files:
  lib/Target/X86/X86ISelLowering.cpp


Index: lib/Target/X86/X86ISelLowering.cpp
===================================================================
--- lib/Target/X86/X86ISelLowering.cpp
+++ lib/Target/X86/X86ISelLowering.cpp
@@ -2991,11 +2991,15 @@
       "Var args not supported with calling conv' regcall, fastcc, ghc or hipe");
 
   if (CallConv == CallingConv::X86_INTR) {
-    bool isLegal = Ins.size() == 1 ||
-                   (Ins.size() == 2 && ((Is64Bit && Ins[1].VT == MVT::i64) ||
-                                        (!Is64Bit && Ins[1].VT == MVT::i32)));
-    if (!isLegal)
+    bool IsArgnLegal = Ins.size() == 1 || Ins.size() == 2;
+    if(!IsArgnLegal)
       report_fatal_error("X86 interrupts may take one or two arguments");
+    bool IsArg2Legal = (Ins.size() == 2 &&
+                       ((Is64Bit && Ins[1].VT == MVT::i64) ||
+                        (!Is64Bit && Ins[1].VT == MVT::i32)));
+    if (!IsArg2Legal)
+      report_fatal_error("X86 interrupts' second argument must be a "
+                         "machine-sized word");
   }
 
   // Assign locations to all of the incoming arguments.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D45938.143597.patch
Type: text/x-patch
Size: 1092 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180423/f73d1598/attachment.bin>