Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I892bbc73c276842894a720f761ce31ad1b015672

1 files changed, 11 insertions, 8 deletions

diff --git a/src/3rdparty/v8/src/safepoint-table.h b/src/3rdparty/v8/src/safepoint-table.h
index 57fceec..307d948 100644
--- a/src/3rdparty/v8/src/safepoint-table.h
+++ b/src/3rdparty/v8/src/safepoint-table.h
@@ -183,8 +183,8 @@ class Safepoint BASE_EMBEDDED {
   static const int kNoDeoptimizationIndex =
       (1 << (SafepointEntry::kDeoptIndexBits)) - 1;
 
-  void DefinePointerSlot(int index) { indexes_->Add(index); }
-  void DefinePointerRegister(Register reg);
+  void DefinePointerSlot(int index, Zone* zone) { indexes_->Add(index, zone); }
+  void DefinePointerRegister(Register reg, Zone* zone);
 
  private:
   Safepoint(ZoneList<int>* indexes, ZoneList<int>* registers) :
@@ -198,13 +198,14 @@ class Safepoint BASE_EMBEDDED {
 
 class SafepointTableBuilder BASE_EMBEDDED {
  public:
-  SafepointTableBuilder()
-      : deoptimization_info_(32),
-        deopt_index_list_(32),
-        indexes_(32),
-        registers_(32),
+  explicit SafepointTableBuilder(Zone* zone)
+      : deoptimization_info_(32, zone),
+        deopt_index_list_(32, zone),
+        indexes_(32, zone),
+        registers_(32, zone),
         emitted_(false),
-        last_lazy_safepoint_(0) { }
+        last_lazy_safepoint_(0),
+        zone_(zone) { }
 
   // Get the offset of the emitted safepoint table in the code.
   unsigned GetCodeOffset() const;
@@ -242,6 +243,8 @@ class SafepointTableBuilder BASE_EMBEDDED {
   bool emitted_;
   int last_lazy_safepoint_;
 
+  Zone* zone_;
+
   DISALLOW_COPY_AND_ASSIGN(SafepointTableBuilder);
 };