Merge 4205:4215 from bleeding_edge to partial_snapshots branch.

src/circular-queue-inl.h

Index: src/circular-queue-inl.h
===================================================================
--- src/circular-queue-inl.h	(revision 4215)
+++ src/circular-queue-inl.h	(working copy)
@@ -82,11 +82,10 @@
 
 
 void* SamplingCircularQueue::Enqueue() {
-  Cell* enqueue_pos = reinterpret_cast<Cell*>(
-      Thread::GetThreadLocal(producer_key_));
-  WrapPositionIfNeeded(&enqueue_pos);
-  Thread::SetThreadLocal(producer_key_, enqueue_pos + record_size_);
-  return enqueue_pos;
+  WrapPositionIfNeeded(&producer_pos_->enqueue_pos);
+  void* result = producer_pos_->enqueue_pos;
+  producer_pos_->enqueue_pos += record_size_;
+  return result;
 }