Merge r5467..r5469 into branches/2.3....

src/log.cc

Index: src/log.cc
===================================================================
--- src/log.cc	(revision 5469)
+++ src/log.cc	(working copy)
@@ -170,7 +170,9 @@
   SafeStackTraceFrameIterator it(sample->fp, sample->sp,
                                  sample->sp, js_entry_sp);
   while (!it.done() && i < TickSample::kMaxFramesCount) {
-    sample->stack[i++] = reinterpret_cast<Address>(it.frame()->function());
+    sample->stack[i++] =
+        reinterpret_cast<Address>(it.frame()->function_slot_object()) -
+            kHeapObjectTag;
     it.Advance();
   }
   sample->frames_count = i;