|
|
@@ -3,7 +3,7 @@
|
|
|
# Date 1532600149 -36000
|
|
|
# Thu Jul 26 20:15:49 2018 +1000
|
|
|
# Node ID e3a286413269f7c023fa55bfa1775be47d415547
|
|
|
-# Parent e632f01e26801f83cf689c4b76e591a743e8194a
|
|
|
+# Parent 48f663dfaf1a037d4d4d6f1474b4e9b368a33d2f
|
|
|
Bug 1477626 - Move js::Hash{Set,Map} into MFBT. r=Waldo
|
|
|
|
|
|
The main change is that the patch copies js/public/HashTable.h to
|
|
|
@@ -2064,7 +2064,7 @@ diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
|
|
|
diff --git a/js/public/UbiNode.h b/js/public/UbiNode.h
|
|
|
--- a/js/public/UbiNode.h
|
|
|
+++ b/js/public/UbiNode.h
|
|
|
-@@ -1162,17 +1162,17 @@ class JS_PUBLIC_API(Concrete<void>) : pu
|
|
|
+@@ -1164,17 +1164,17 @@ class JS_PUBLIC_API(Concrete<void>) : pu
|
|
|
public:
|
|
|
static void construct(void* storage, void* ptr) { new (storage) Concrete(ptr); }
|
|
|
};
|
|
|
@@ -2178,7 +2178,7 @@ diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
|
|
|
diff --git a/js/src/jsapi-tests/testUbiNode.cpp b/js/src/jsapi-tests/testUbiNode.cpp
|
|
|
--- a/js/src/jsapi-tests/testUbiNode.cpp
|
|
|
+++ b/js/src/jsapi-tests/testUbiNode.cpp
|
|
|
-@@ -304,33 +304,33 @@ struct ExpectedEdge
|
|
|
+@@ -306,33 +306,33 @@ struct ExpectedEdge
|
|
|
char to;
|
|
|
|
|
|
ExpectedEdge(FakeNode& fromNode, FakeNode& toNode)
|
|
|
@@ -2334,7 +2334,7 @@ diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
|
|
|
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
|
|
|
--- a/js/src/vm/Stack.h
|
|
|
+++ b/js/src/vm/Stack.h
|
|
|
-@@ -1047,29 +1047,37 @@ FillArgumentsFromArraylike(JSContext* cx
|
|
|
+@@ -1048,29 +1048,37 @@ FillArgumentsFromArraylike(JSContext* cx
|
|
|
return false;
|
|
|
|
|
|
for (uint32_t i = 0; i < len; i++)
|
|
|
@@ -2444,8 +2444,8 @@ diff --git a/js/src/vm/UbiNodeCensus.cpp b/js/src/vm/UbiNodeCensus.cpp
|
|
|
diff --git a/js/src/wasm/WasmValidate.cpp b/js/src/wasm/WasmValidate.cpp
|
|
|
--- a/js/src/wasm/WasmValidate.cpp
|
|
|
+++ b/js/src/wasm/WasmValidate.cpp
|
|
|
-@@ -1735,17 +1735,17 @@ DecodeGlobalSection(Decoder& d, ModuleEn
|
|
|
- return false;
|
|
|
+@@ -1758,17 +1758,17 @@ DecodeGlobalSection(Decoder& d, ModuleEn
|
|
|
+ }
|
|
|
|
|
|
env->globals.infallibleAppend(GlobalDesc(initializer, isMutable));
|
|
|
}
|
Frank-Rainer Grahl