Merge branch 'rickard/exit/2-refc/OTP-9005' into dev

* rickard/exit/2-refc/OTP-9005: Decrement refc after unlock in exit/2
erlang · Dec 17, 2010 · 962a313 · 962a313
2 parents 1b5f4da + 264f3be
commit 962a313
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
@@ -1351,9 +1351,10 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 #ifdef ERTS_SMP
 	 if (rp == BIF_P)
 	     rp_locks &= ~ERTS_PROC_LOCK_MAIN;
-	 else
+	 if (rp_locks)
+	     erts_smp_proc_unlock(rp, rp_locks);
+	 if (rp != BIF_P)
 	     erts_smp_proc_dec_refc(rp);
-	 erts_smp_proc_unlock(rp, rp_locks);
 #endif
 	 /*
 	  * We may have exited ourselves and may have to take action.