diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-07 10:42:34 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-07 10:42:34 +0200 |
| commit | a83b493d40f7c2e0303037d67cecde301668ef79 (patch) | |
| tree | 88f79a34a128f3e2c1d462e8dbdb1fd5240a6b37 /erts/emulator/hipe/hipe_amd64_glue.S | |
| parent | 03997d5a1c166e8470dd9c888a5dba121144986a (diff) | |
| parent | 8bbcecd938f46127bc40ff7aed91d4e519d0cd5b (diff) | |
| download | otp-a83b493d40f7c2e0303037d67cecde301668ef79.tar.gz otp-a83b493d40f7c2e0303037d67cecde301668ef79.tar.bz2 otp-a83b493d40f7c2e0303037d67cecde301668ef79.zip | |
Merge branch 'pg/fix-hipe-crash-in-gc_after_bif' into dev
* pg/fix-hipe-crash-in-gc_after_bif:
Fix call to erts_gc_after_bif_call in hipe glue
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_glue.S')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_glue.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_glue.S b/erts/emulator/hipe/hipe_amd64_glue.S index 83b7b0397b..ede762aae0 100644 --- a/erts/emulator/hipe/hipe_amd64_glue.S +++ b/erts/emulator/hipe/hipe_amd64_glue.S @@ -346,6 +346,8 @@ nbif_3_gc_after_bif: subq $(16-8), %rsp movq P, %rdi movq %rax, %rsi + xorl %edx, %edx # Pass NULL in regs + xorl %ecx, %ecx # Pass 0 in arity call CSYM(erts_gc_after_bif_call) addq $(16-8), %rsp movl $0, P_NARITY(P) # Note: narity is a 32-bit field |