View | Details | Raw Unified | Return to bug 208467 | Differences between
and this patch

Collapse All | Expand All

(-)www/node4/files/patch-deps_v8_src_compiler_instruction.h (+11 lines)
Line 0 Link Here
1
--- deps/v8/src/compiler/instruction.h.orig	2016-03-16 21:22:58.000000000 +0100
2
+++ deps/v8/src/compiler/instruction.h	2016-03-24 23:27:23.004854000 +0100
3
@@ -1011,7 +1011,7 @@ class InstructionBlock final : public Zo
4
 
5
 typedef ZoneDeque<Constant> ConstantDeque;
6
 typedef std::map<int, Constant, std::less<int>,
7
-                 zone_allocator<std::pair<int, Constant> > > ConstantMap;
8
+                 zone_allocator<std::pair<const int, Constant> > > ConstantMap;
9
 
10
 typedef ZoneDeque<Instruction*> InstructionDeque;
11
 typedef ZoneDeque<ReferenceMap*> ReferenceMapDeque;
(-)www/node4/files/patch-deps_v8_src_compiler_js-type-feedback.h (+15 lines)
Line 0 Link Here
1
--- deps/v8/src/compiler/js-type-feedback.h.orig	2016-03-16 21:22:58.000000000 +0100
2
+++ deps/v8/src/compiler/js-type-feedback.h	2016-03-24 22:54:54.529827000 +0100
3
@@ -33,9 +33,10 @@ class JSTypeFeedbackTable : public ZoneO
4
  private:
5
   friend class JSTypeFeedbackSpecializer;
6
   typedef std::map<NodeId, TypeFeedbackId, std::less<NodeId>,
7
-                   zone_allocator<TypeFeedbackId> > TypeFeedbackIdMap;
8
+                   zone_allocator<std::pair<const NodeId, TypeFeedbackId> > >
9
+      TypeFeedbackIdMap;
10
   typedef std::map<NodeId, FeedbackVectorICSlot, std::less<NodeId>,
11
-                   zone_allocator<FeedbackVectorICSlot> >
12
+                   zone_allocator<std::pair<const NodeId, FeedbackVectorICSlot> > >
13
       FeedbackVectorICSlotMap;
14
 
15
   TypeFeedbackIdMap type_feedback_id_map_;
(-)www/node4/files/patch-deps_v8_src_zone-containers.h (+18 lines)
Line 0 Link Here
1
--- deps/v8/src/zone-containers.h.orig	2016-03-16 21:22:58.000000000 +0100
2
+++ deps/v8/src/zone-containers.h	2016-03-24 23:34:37.741885000 +0100
3
@@ -114,12 +114,12 @@ class ZoneSet : public std::set<K, Compa
4
 // a zone allocator.
5
 template <typename K, typename V, typename Compare = std::less<K>>
6
 class ZoneMap
7
-    : public std::map<K, V, Compare, zone_allocator<std::pair<K, V>>> {
8
+    : public std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>> {
9
  public:
10
   // Constructs an empty map.
11
   explicit ZoneMap(Zone* zone)
12
-      : std::map<K, V, Compare, zone_allocator<std::pair<K, V>>>(
13
-            Compare(), zone_allocator<std::pair<K, V>>(zone)) {}
14
+      : std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>>(
15
+            Compare(), zone_allocator<std::pair<const K, V>>(zone)) {}
16
 };
17
 
18
 

Return to bug 208467