Merged r16393, r16396 into trunk branch.

src/hydrogen-instructions.cc

Index: src/hydrogen-instructions.cc
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index 0bd7b7935bcc0e2eacff96578da05e4b4aa00eb6..a9adfc13f7a73012b2b05f22f2639dff75dd0e5c 100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -3323,12 +3323,12 @@ void HAllocate::HandleSideEffectDominator(GVNFlag side_effect,
   } else {
     // TODO(hpayer): This is a short-term hack to make allocation mementos
     // work again in new space.
-    ClearNextMapWord(original_object_size);
+    dominator_allocate->ClearNextMapWord(original_object_size);
   }
 #else
   // TODO(hpayer): This is a short-term hack to make allocation mementos
   // work again in new space.
-  ClearNextMapWord(original_object_size);
+  dominator_allocate->ClearNextMapWord(original_object_size);
 #endif
 
   dominator_allocate->clear_next_map_word_ = clear_next_map_word_;