aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-06-18 16:53:49 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-06-24 16:22:30 +0200
commitba020bd06c34eaf5b450495a852f31357ef042b5 (patch)
tree7d5d3d20d7e605817b14273ef270b0189290d31a /erts/emulator/beam
parent256c60d885b6fe0e8a715fa9bfdd371ad14c8857 (diff)
downloadotp-ba020bd06c34eaf5b450495a852f31357ef042b5.tar.gz
otp-ba020bd06c34eaf5b450495a852f31357ef042b5.tar.bz2
otp-ba020bd06c34eaf5b450495a852f31357ef042b5.zip
erts: Remove halfword copy_object_rel
Near duplication of copy_object but with base ptr that is no longer used.
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_db_util.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 41b32fc0e7..ae9a853411 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -1748,17 +1748,6 @@ static Eterm dpm_array_to_list(Process *psp, Eterm *arr, int arity)
return ret;
}
-static ERTS_INLINE Eterm copy_object_rel(Process* p, Eterm term, Eterm* base)
-{
- if (!is_immed(term)) {
- Uint sz = size_object(term);
- Eterm* top = HAllocX(p, sz, HEAP_XTRA);
- return copy_struct(term, sz, &top, &MSO(p));
- }
- return term;
-}
-
-
/*
** Execution of the match program, this is Pam.
** May return THE_NON_VALUE, which is a bailout.
@@ -2167,12 +2156,11 @@ restart:
break;
case matchPushVResult:
if (!(in_flags & ERTS_PAM_COPY_RESULT)) goto case_matchPushV;
-
/* Build (NULL-based) copy on callers heap */
n = *pc++;
ASSERT(is_value(variables[n].term));
ASSERT(!variables[n].proc);
- variables[n].term = copy_object_rel(c_p, variables[n].term, base);
+ variables[n].term = copy_object(variables[n].term, c_p);
*esp++ = variables[n].term;
#ifdef DEBUG
variables[n].proc = c_p;