Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bug

1 files changed, 35 insertions, 28 deletions

diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 5e127755c6..73d07f0ce5 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -2,7 +2,7 @@
  * %CopyrightBegin%
 
  *
- * Copyright Ericsson AB 2001-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,80 +32,87 @@
 #include "big.h"
 #include "error.h"
 #include "beam_load.h"
+#include "erl_vm.h"
 #include "hipe_bif0.h"
 #include "hipe_bif1.h"
 
-#define BeamOpCode(Op)	((Uint)BeamOp(Op))
-
 BIF_RETTYPE hipe_bifs_call_count_on_1(BIF_ALIST_1)
 {
+    ErtsCodeInfo *ci;
     Eterm *pc;
     struct hipe_call_count *hcc;
 
-    pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
-    if (!pc)
+    ci = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
+    if (!ci)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
-    if (pc[0] == BeamOpCode(op_hipe_trap_call))
+    ASSERT(BeamIsOpCode(ci->op, op_i_func_info_IaaI));
+    pc = erts_codeinfo_to_code(ci);
+    if (BeamIsOpCode(pc[0], op_hipe_trap_call))
 	BIF_ERROR(BIF_P, BADARG);
-    if (pc[0] == BeamOpCode(op_hipe_call_count))
+    if (BeamIsOpCode(pc[0], op_hipe_call_count))
 	BIF_RET(NIL);
-    hcc = erts_alloc(ERTS_ALC_T_HIPE, sizeof(*hcc));
+    hcc = erts_alloc(ERTS_ALC_T_HIPE_SL, sizeof(*hcc));
     hcc->count = 0;
     hcc->opcode = pc[0];
-    pc[-4] = (Eterm)hcc;
-    pc[0] = BeamOpCode(op_hipe_call_count);
+    ci->u.hcc = hcc;
+    pc[0] = BeamOpCodeAddr(op_hipe_call_count);
     BIF_RET(am_true);
 }
 
 BIF_RETTYPE hipe_bifs_call_count_off_1(BIF_ALIST_1)
 {
+    ErtsCodeInfo* ci;
     Eterm *pc;
     struct hipe_call_count *hcc;
     unsigned count;
 
-    pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
-    if (!pc)
+    ci = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
+    if (!ci)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
-    if (pc[0] != BeamOpCode(op_hipe_call_count))
+    ASSERT(BeamIsOpCode(ci->op, op_i_func_info_IaaI));
+    pc = erts_codeinfo_to_code(ci);
+    if (! BeamIsOpCode(pc[0], op_hipe_call_count))
 	BIF_RET(am_false);
-    hcc = (struct hipe_call_count*)pc[-4];
+    hcc = ci->u.hcc;
     count = hcc->count;
     pc[0] = hcc->opcode;
-    pc[-4] = (Eterm)NULL;
-    erts_free(ERTS_ALC_T_HIPE, hcc);
+    ci->u.hcc = NULL;
+    erts_free(ERTS_ALC_T_HIPE_SL, hcc);
     BIF_RET(make_small(count));
 }
 
 BIF_RETTYPE hipe_bifs_call_count_get_1(BIF_ALIST_1)
 {
+    ErtsCodeInfo* ci;
     Eterm *pc;
     struct hipe_call_count *hcc;
 
-    pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
-    if (!pc)
+    ci = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
+    if (!ci)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
-    if (pc[0] != BeamOpCode(op_hipe_call_count))
+    ASSERT(BeamIsOpCode(ci->op, op_i_func_info_IaaI));
+    pc = erts_codeinfo_to_code(ci);
+    if (! BeamIsOpCode(pc[0], op_hipe_call_count))
 	BIF_RET(am_false);
-    hcc = (struct hipe_call_count*)pc[-4];
+    hcc = ci->u.hcc;
     BIF_RET(make_small(hcc->count));
 }
 
 BIF_RETTYPE hipe_bifs_call_count_clear_1(BIF_ALIST_1)
 {
+    ErtsCodeInfo* ci;
     Eterm *pc;
     struct hipe_call_count *hcc;
     unsigned count;
 
-    pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
-    if (!pc)
+    ci = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
+    if (!ci)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
-    if (pc[0] != BeamOpCode(op_hipe_call_count))
+    ASSERT(BeamIsOpCode(ci->op, op_i_func_info_IaaI));
+    pc = erts_codeinfo_to_code(ci);
+    if (! BeamIsOpCode(pc[0], op_hipe_call_count))
 	BIF_RET(am_false);
-    hcc = (struct hipe_call_count*)pc[-4];
+    hcc = ci->u.hcc;
     count = hcc->count;
     hcc->count = 0;
     BIF_RET(make_small(count));