Merge remote-tracking branch 'origin/master' into ghc-parmake-gsocghc-parmake-gsoc

1 files changed, 8 insertions, 8 deletions

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 3cfec94b72..e278bb70ab 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -460,14 +460,6 @@ stg_addCFinalizzerToWeakzh ( W_ fptr,   // finalizer
 {
   W_ c, info;
 
-  LOCK_CLOSURE(w, info);
-
-  if (info == stg_DEAD_WEAK_info) {
-    // Already dead.
-    unlockClosure(w, info);
-    return (0);
-  }
-
   ALLOC_PRIM (SIZEOF_StgCFinalizerList)
 
   c = Hp - SIZEOF_StgCFinalizerList + WDS(1);
@@ -478,6 +470,14 @@ stg_addCFinalizzerToWeakzh ( W_ fptr,   // finalizer
   StgCFinalizerList_eptr(c) = eptr;
   StgCFinalizerList_flag(c) = flag;
 
+  LOCK_CLOSURE(w, info);
+
+  if (info == stg_DEAD_WEAK_info) {
+    // Already dead.
+    unlockClosure(w, info);
+    return (0);
+  }
+
   StgCFinalizerList_link(c) = StgWeak_cfinalizers(w);
   StgWeak_cfinalizers(w) = c;