From 17241c30f56ba6bc31518f1c905f6178784fb4fa Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Fri, 14 Oct 2011 19:23:26 +0200
Subject: erts-hipe: Fix new trap conventions for x86, amd64 and ppc

---
 erts/emulator/beam/erl_gc.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'erts/emulator/beam/erl_gc.c')

diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 17cc6e0a2c..36615f913d 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -315,6 +315,11 @@ erts_gc_after_bif_call(Process* p, Eterm result, Eterm* regs, Uint arity)
 
     if (is_non_value(result)) {
 	if (p->freason == TRAP) {
+	  #if HIPE
+	    if (regs == NULL) {
+		regs = ERTS_PROC_GET_SCHDATA(p)->x_reg_array;
+	    }
+	  #endif
 	    cost = erts_garbage_collect(p, 0, regs, p->arity);
 	} else {
 	    cost = erts_garbage_collect(p, 0, regs, arity);
-- 
cgit v1.2.3