Index: lib/Target/BPF/BPFISelLowering.cpp
===================================================================
--- lib/Target/BPF/BPFISelLowering.cpp
+++ lib/Target/BPF/BPFISelLowering.cpp
@@ -199,6 +199,7 @@
       }
     } else {
       fail(DL, DAG, "defined with too many args");
+      InVals.push_back(DAG.getUNDEF(MVT::Other));
     }
   }
 
Index: test/CodeGen/BPF/many_args2.ll
===================================================================
--- test/CodeGen/BPF/many_args2.ll
+++ test/CodeGen/BPF/many_args2.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -march=bpf -exit-on-error < %s 2> %t1
+; RUN: not llc -march=bpf < %s 2> %t1
 ; RUN: FileCheck %s < %t1
 ; CHECK: too many args