Title: [210420] branches/safari-603-branch/Source/_javascript_Core
- Revision
- 210420
- Author
- matthew_han...@apple.com
- Date
- 2017-01-05 17:49:23 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210202. rdar://problem/29803676
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210419 => 210420)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 01:49:20 UTC (rev 210419)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 01:49:23 UTC (rev 210420)
@@ -1,5 +1,16 @@
2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210202. rdar://problem/29803676
+
+ 2016-12-28 Saam Barati <sbar...@apple.com>
+
+ Unreviewed. Fix jsc.cpp build error.
+
+ * jsc.cpp:
+ (functionTestWasmModuleFunctions):
+
+2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210201. rdar://problem/29803676
2016-12-28 Saam Barati <sbar...@apple.com>
Modified: branches/safari-603-branch/Source/_javascript_Core/jsc.cpp (210419 => 210420)
--- branches/safari-603-branch/Source/_javascript_Core/jsc.cpp 2017-01-06 01:49:20 UTC (rev 210419)
+++ branches/safari-603-branch/Source/_javascript_Core/jsc.cpp 2017-01-06 01:49:23 UTC (rev 210420)
@@ -2633,21 +2633,9 @@
});
}
- void* memoryBytes = nullptr;
- uint32_t memorySize = 0;
- std::unique_ptr<Wasm::Memory> memory;
std::unique_ptr<Wasm::ModuleInformation> moduleInformation = plan.takeModuleInformation();
+ RELEASE_ASSERT(!moduleInformation->memory);
- if (!!moduleInformation->memory) {
- bool failed;
- memory = std::make_unique<Wasm::Memory>(moduleInformation->memory.initial(), moduleInformation->memory.maximum(), failed);
- RELEASE_ASSERT(!failed);
- memoryBytes = memory->memory();
- memorySize = memory->size();
- }
- vm.topWasmMemoryPointer = memoryBytes;
- vm.topWasmMemorySize = memorySize;
-
for (uint32_t i = 0; i < functionCount; ++i) {
JSArray* testCases = jsCast<JSArray*>(exec->argument(i + 2));
for (unsigned testIndex = 0; testIndex < testCases->length(); ++testIndex) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
