Merge branch 'sverk/bif-args/OTP-9662'

* sverk/bif-args/OTP-9662:
  erts,hipe: Limited support for hipe cross compilation
  erts-hipe: Change THE_NON_VALUE for HiPE enabled debug emulator
  erts-hipe: Enable debug compiled hipe-VM with lock checker
  erts-hipe: Rename fail_bif_interface_0 to standard_bif_interface_0
  erts-hipe: Deliberate leak of native fun entries
  erts-hipe: Fix new trap conventions for x86, amd64 and ppc
  Store the trap address in p->i
  Store the trap arguments in the X register array
  erts-hipe: Make some primops use new BIF calling convention
  erts-hipe: Adapt generated BIF wrappers for new calling convention
  erts-hipe: Remove obscuring macros in generated assembler code
  erts-hipe: Make hipe enabled emulator compile with new BIF calls
  Simplify the instructions for calling BIFs
  Change the calling convention for BIFs
  Use the proper macros in all BIFs

Conflicts:
	erts/emulator/beam/bif.h
	erts/emulator/beam/erl_bif_info.c

1 files changed, 15 insertions, 10 deletions

diff --git a/erts/emulator/beam/erl_bif_op.c b/erts/emulator/beam/erl_bif_op.c
index deda7adc1f..13f8b1f63c 100644
--- a/erts/emulator/beam/erl_bif_op.c
+++ b/erts/emulator/beam/erl_bif_op.c
@@ -225,18 +225,23 @@ BIF_RETTYPE is_function_1(BIF_ALIST_1)
 
 BIF_RETTYPE is_function_2(BIF_ALIST_2)
 {
+    BIF_RET(erl_is_function(BIF_P, BIF_ARG_1, BIF_ARG_2));
+}
+
+Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2)
+{
     Sint arity;
 
     /*
      * Verify argument 2 (arity); arity must be >= 0.
      */ 
-    if (is_small(BIF_ARG_2)) {
-	arity = signed_val(BIF_ARG_2);
+    if (is_small(arg2)) {
+	arity = signed_val(arg2);
 	if (arity < 0) {
 	error:
-	    BIF_ERROR(BIF_P, BADARG);
+	    BIF_ERROR(p, BADARG);
 	}
-    } else if (is_big(BIF_ARG_2) && !bignum_header_is_neg(*big_val(BIF_ARG_2))) {
+    } else if (is_big(arg2) && !bignum_header_is_neg(*big_val(arg2))) {
 	/* A positive bignum is OK, but can't possibly match. */
 	arity = -1;
     } else {
@@ -244,20 +249,20 @@ BIF_RETTYPE is_function_2(BIF_ALIST_2)
 	goto error;
     }
 
-    if (is_fun(BIF_ARG_1)) {
-	ErlFunThing* funp = (ErlFunThing *) fun_val(BIF_ARG_1);
+    if (is_fun(arg1)) {
+	ErlFunThing* funp = (ErlFunThing *) fun_val(arg1);
 
 	if (funp->arity == (Uint) arity) {
 	    BIF_RET(am_true);
 	}
-    } else if (is_export(BIF_ARG_1)) {
-	Export* exp = (Export *) EXPAND_POINTER((export_val(BIF_ARG_1))[1]);
+    } else if (is_export(arg1)) {
+	Export* exp = (Export *) EXPAND_POINTER((export_val(arg1))[1]);
 
 	if (exp->code[2] == (Uint) arity) {
 	    BIF_RET(am_true);
 	}
-    } else if (is_tuple(BIF_ARG_1)) {
-	Eterm* tp = tuple_val(BIF_ARG_1);
+    } else if (is_tuple(arg1)) {
+	Eterm* tp = tuple_val(arg1);
 	if (tp[0] == make_arityval(2) && is_atom(tp[1]) && is_atom(tp[2])) {
 	    BIF_RET(am_true);
 	}