OLD | NEW |
---|---|
1 // Copyright 2016 the V8 project authors. All rights reserved. | 1 // Copyright 2016 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/value-serializer.h" | 5 #include "src/value-serializer.h" |
6 | 6 |
7 #include <type_traits> | 7 #include <type_traits> |
8 | 8 |
9 #include "src/base/logging.h" | 9 #include "src/base/logging.h" |
10 #include "src/conversions.h" | 10 #include "src/conversions.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
119 // ObjectReference to one) serialized just before it. This is a quirk arising | 119 // ObjectReference to one) serialized just before it. This is a quirk arising |
120 // from the previous stack-based implementation. | 120 // from the previous stack-based implementation. |
121 kArrayBufferView = 'V', | 121 kArrayBufferView = 'V', |
122 // Shared array buffer. transferID:uint32_t | 122 // Shared array buffer. transferID:uint32_t |
123 kSharedArrayBuffer = 'u', | 123 kSharedArrayBuffer = 'u', |
124 // Compiled WebAssembly module. encodingType:(one-byte tag). | 124 // Compiled WebAssembly module. encodingType:(one-byte tag). |
125 // If encodingType == 'y' (raw bytes): | 125 // If encodingType == 'y' (raw bytes): |
126 // wasmWireByteLength:uint32_t, then raw data | 126 // wasmWireByteLength:uint32_t, then raw data |
127 // compiledDataLength:uint32_t, then raw data | 127 // compiledDataLength:uint32_t, then raw data |
128 kWasmModule = 'W', | 128 kWasmModule = 'W', |
129 // A wasm module object transfer. next value is its index. | |
130 kWasmModuleTransfer = 'w', | |
129 // The delegate is responsible for processing all following data. | 131 // The delegate is responsible for processing all following data. |
130 // This "escapes" to whatever wire format the delegate chooses. | 132 // This "escapes" to whatever wire format the delegate chooses. |
131 kHostObject = '\\', | 133 kHostObject = '\\', |
132 }; | 134 }; |
133 | 135 |
134 namespace { | 136 namespace { |
135 | 137 |
136 enum class ArrayBufferViewTag : uint8_t { | 138 enum class ArrayBufferViewTag : uint8_t { |
137 kInt8Array = 'b', | 139 kInt8Array = 'b', |
138 kUint8Array = 'B', | 140 kUint8Array = 'B', |
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
796 DCHECK(view->IsJSDataView()); | 798 DCHECK(view->IsJSDataView()); |
797 tag = ArrayBufferViewTag::kDataView; | 799 tag = ArrayBufferViewTag::kDataView; |
798 } | 800 } |
799 WriteVarint(static_cast<uint8_t>(tag)); | 801 WriteVarint(static_cast<uint8_t>(tag)); |
800 WriteVarint(NumberToUint32(view->byte_offset())); | 802 WriteVarint(NumberToUint32(view->byte_offset())); |
801 WriteVarint(NumberToUint32(view->byte_length())); | 803 WriteVarint(NumberToUint32(view->byte_length())); |
802 return ThrowIfOutOfMemory(); | 804 return ThrowIfOutOfMemory(); |
803 } | 805 } |
804 | 806 |
805 Maybe<bool> ValueSerializer::WriteWasmModule(Handle<JSObject> object) { | 807 Maybe<bool> ValueSerializer::WriteWasmModule(Handle<JSObject> object) { |
808 if (delegate_ != nullptr) { | |
809 Maybe<uint32_t> transfer_id = delegate_->GetWasmModuleTransferId( | |
jbroman
2017/03/17 17:08:32
Do these calls into the delegate need to promote s
Mircea Trofin
2017/03/17 17:16:11
I don't think so, the transferring doesn't throw (
| |
810 reinterpret_cast<v8::Isolate*>(isolate_), | |
811 v8::Local<v8::WasmCompiledModule>::Cast(Utils::ToLocal(object))); | |
812 uint32_t id = 0; | |
813 if (transfer_id.To(&id)) { | |
814 WriteTag(SerializationTag::kWasmModuleTransfer); | |
815 WriteVarint<uint32_t>(id); | |
816 return Just(true); | |
817 } | |
818 } | |
819 | |
806 Handle<WasmCompiledModule> compiled_part( | 820 Handle<WasmCompiledModule> compiled_part( |
807 WasmCompiledModule::cast(object->GetEmbedderField(0)), isolate_); | 821 WasmCompiledModule::cast(object->GetEmbedderField(0)), isolate_); |
808 WasmEncodingTag encoding_tag = WasmEncodingTag::kRawBytes; | 822 WasmEncodingTag encoding_tag = WasmEncodingTag::kRawBytes; |
809 WriteTag(SerializationTag::kWasmModule); | 823 WriteTag(SerializationTag::kWasmModule); |
810 WriteRawBytes(&encoding_tag, sizeof(encoding_tag)); | 824 WriteRawBytes(&encoding_tag, sizeof(encoding_tag)); |
811 | 825 |
812 Handle<String> wire_bytes(compiled_part->module_bytes(), isolate_); | 826 Handle<String> wire_bytes(compiled_part->module_bytes(), isolate_); |
813 int wire_bytes_length = wire_bytes->length(); | 827 int wire_bytes_length = wire_bytes->length(); |
814 WriteVarint<uint32_t>(wire_bytes_length); | 828 WriteVarint<uint32_t>(wire_bytes_length); |
815 uint8_t* destination; | 829 uint8_t* destination; |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1143 case SerializationTag::kArrayBufferTransfer: { | 1157 case SerializationTag::kArrayBufferTransfer: { |
1144 const bool is_shared = false; | 1158 const bool is_shared = false; |
1145 return ReadTransferredJSArrayBuffer(is_shared); | 1159 return ReadTransferredJSArrayBuffer(is_shared); |
1146 } | 1160 } |
1147 case SerializationTag::kSharedArrayBuffer: { | 1161 case SerializationTag::kSharedArrayBuffer: { |
1148 const bool is_shared = true; | 1162 const bool is_shared = true; |
1149 return ReadTransferredJSArrayBuffer(is_shared); | 1163 return ReadTransferredJSArrayBuffer(is_shared); |
1150 } | 1164 } |
1151 case SerializationTag::kWasmModule: | 1165 case SerializationTag::kWasmModule: |
1152 return ReadWasmModule(); | 1166 return ReadWasmModule(); |
1167 case SerializationTag::kWasmModuleTransfer: | |
1168 return ReadWasmModuleTransfer(); | |
1153 case SerializationTag::kHostObject: | 1169 case SerializationTag::kHostObject: |
1154 return ReadHostObject(); | 1170 return ReadHostObject(); |
1155 default: | 1171 default: |
1156 // Before there was an explicit tag for host objects, all unknown tags | 1172 // Before there was an explicit tag for host objects, all unknown tags |
1157 // were delegated to the host. | 1173 // were delegated to the host. |
1158 if (version_ < 13) { | 1174 if (version_ < 13) { |
1159 position_--; | 1175 position_--; |
1160 return ReadHostObject(); | 1176 return ReadHostObject(); |
1161 } | 1177 } |
1162 return MaybeHandle<Object>(); | 1178 return MaybeHandle<Object>(); |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1588 byte_length % element_size != 0) { | 1604 byte_length % element_size != 0) { |
1589 return MaybeHandle<JSArrayBufferView>(); | 1605 return MaybeHandle<JSArrayBufferView>(); |
1590 } | 1606 } |
1591 Handle<JSTypedArray> typed_array = isolate_->factory()->NewJSTypedArray( | 1607 Handle<JSTypedArray> typed_array = isolate_->factory()->NewJSTypedArray( |
1592 external_array_type, buffer, byte_offset, byte_length / element_size, | 1608 external_array_type, buffer, byte_offset, byte_length / element_size, |
1593 pretenure_); | 1609 pretenure_); |
1594 AddObjectWithID(id, typed_array); | 1610 AddObjectWithID(id, typed_array); |
1595 return typed_array; | 1611 return typed_array; |
1596 } | 1612 } |
1597 | 1613 |
1614 MaybeHandle<JSObject> ValueDeserializer::ReadWasmModuleTransfer() { | |
1615 if (FLAG_wasm_disable_structured_cloning || expect_inline_wasm()) { | |
1616 return MaybeHandle<JSObject>(); | |
1617 } | |
1618 | |
1619 uint32_t transfer_id = 0; | |
1620 Local<Value> module_value; | |
1621 if (ReadVarint<uint32_t>().To(&transfer_id) && delegate_ != nullptr && | |
1622 delegate_ | |
1623 ->GetWasmModuleFromId(reinterpret_cast<v8::Isolate*>(isolate_), | |
jbroman
2017/03/17 17:08:32
Do these calls into the delegate need to promote s
Mircea Trofin
2017/03/17 17:16:11
I don't think so, the transferring doesn't throw (
| |
1624 transfer_id) | |
1625 .ToLocal(&module_value)) { | |
1626 uint32_t id = next_id_++; | |
1627 Handle<JSObject> module = | |
1628 Handle<JSObject>::cast(Utils::OpenHandle(*module_value)); | |
1629 AddObjectWithID(id, module); | |
1630 return module; | |
1631 } else { | |
1632 return MaybeHandle<JSObject>(); | |
1633 } | |
1634 } | |
1635 | |
1598 MaybeHandle<JSObject> ValueDeserializer::ReadWasmModule() { | 1636 MaybeHandle<JSObject> ValueDeserializer::ReadWasmModule() { |
1599 if (FLAG_wasm_disable_structured_cloning) return MaybeHandle<JSObject>(); | 1637 if (FLAG_wasm_disable_structured_cloning || !expect_inline_wasm()) { |
1638 return MaybeHandle<JSObject>(); | |
1639 } | |
1600 | 1640 |
1601 Vector<const uint8_t> encoding_tag; | 1641 Vector<const uint8_t> encoding_tag; |
1602 if (!ReadRawBytes(sizeof(WasmEncodingTag)).To(&encoding_tag) || | 1642 if (!ReadRawBytes(sizeof(WasmEncodingTag)).To(&encoding_tag) || |
1603 encoding_tag[0] != static_cast<uint8_t>(WasmEncodingTag::kRawBytes)) { | 1643 encoding_tag[0] != static_cast<uint8_t>(WasmEncodingTag::kRawBytes)) { |
1604 return MaybeHandle<JSObject>(); | 1644 return MaybeHandle<JSObject>(); |
1605 } | 1645 } |
1606 | 1646 |
1607 // Extract the data from the buffer: wasm wire bytes, followed by V8 compiled | 1647 // Extract the data from the buffer: wasm wire bytes, followed by V8 compiled |
1608 // script data. | 1648 // script data. |
1609 static_assert(sizeof(int) <= sizeof(uint32_t), | 1649 static_assert(sizeof(int) <= sizeof(uint32_t), |
1610 "max int must fit in uint32_t"); | 1650 "max int must fit in uint32_t"); |
1611 const uint32_t max_valid_size = std::numeric_limits<int>::max(); | 1651 const uint32_t max_valid_size = std::numeric_limits<int>::max(); |
1612 uint32_t wire_bytes_length = 0; | 1652 uint32_t wire_bytes_length = 0; |
1613 Vector<const uint8_t> wire_bytes; | 1653 Vector<const uint8_t> wire_bytes; |
1614 uint32_t compiled_bytes_length = 0; | 1654 uint32_t compiled_bytes_length = 0; |
1615 Vector<const uint8_t> compiled_bytes; | 1655 Vector<const uint8_t> compiled_bytes; |
1616 if (!ReadVarint<uint32_t>().To(&wire_bytes_length) || | 1656 if (!ReadVarint<uint32_t>().To(&wire_bytes_length) || |
1617 wire_bytes_length > max_valid_size || | 1657 wire_bytes_length > max_valid_size || |
1618 !ReadRawBytes(wire_bytes_length).To(&wire_bytes) || | 1658 !ReadRawBytes(wire_bytes_length).To(&wire_bytes) || |
1619 !ReadVarint<uint32_t>().To(&compiled_bytes_length) || | 1659 !ReadVarint<uint32_t>().To(&compiled_bytes_length) || |
1620 compiled_bytes_length > max_valid_size || | 1660 compiled_bytes_length > max_valid_size || |
1621 !ReadRawBytes(compiled_bytes_length).To(&compiled_bytes)) { | 1661 !ReadRawBytes(compiled_bytes_length).To(&compiled_bytes)) { |
1622 return MaybeHandle<JSObject>(); | 1662 return MaybeHandle<JSObject>(); |
1623 } | 1663 } |
1624 | 1664 |
1625 // Try to deserialize the compiled module first. | 1665 // Try to deserialize the compiled module first. |
1626 ScriptData script_data(compiled_bytes.start(), compiled_bytes.length()); | 1666 ScriptData script_data(compiled_bytes.start(), compiled_bytes.length()); |
1627 Handle<FixedArray> compiled_part; | 1667 Handle<FixedArray> compiled_part; |
1668 MaybeHandle<JSObject> result; | |
1628 if (WasmCompiledModuleSerializer::DeserializeWasmModule( | 1669 if (WasmCompiledModuleSerializer::DeserializeWasmModule( |
1629 isolate_, &script_data, wire_bytes) | 1670 isolate_, &script_data, wire_bytes) |
1630 .ToHandle(&compiled_part)) { | 1671 .ToHandle(&compiled_part)) { |
1631 return WasmModuleObject::New( | 1672 result = WasmModuleObject::New( |
1632 isolate_, Handle<WasmCompiledModule>::cast(compiled_part)); | 1673 isolate_, Handle<WasmCompiledModule>::cast(compiled_part)); |
1633 } | 1674 } else { |
1634 | |
1635 // If that fails, recompile. | |
1636 MaybeHandle<JSObject> result; | |
1637 { | |
1638 wasm::ErrorThrower thrower(isolate_, "ValueDeserializer::ReadWasmModule"); | 1675 wasm::ErrorThrower thrower(isolate_, "ValueDeserializer::ReadWasmModule"); |
1639 result = wasm::SyncCompile(isolate_, &thrower, | 1676 result = wasm::SyncCompile(isolate_, &thrower, |
1640 wasm::ModuleWireBytes(wire_bytes)); | 1677 wasm::ModuleWireBytes(wire_bytes)); |
1641 } | 1678 } |
1642 RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate_, JSObject); | 1679 RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate_, JSObject); |
1680 uint32_t id = next_id_++; | |
1681 if (!result.is_null()) { | |
1682 AddObjectWithID(id, result.ToHandleChecked()); | |
1683 } | |
1643 return result; | 1684 return result; |
1644 } | 1685 } |
1645 | 1686 |
1646 MaybeHandle<JSObject> ValueDeserializer::ReadHostObject() { | 1687 MaybeHandle<JSObject> ValueDeserializer::ReadHostObject() { |
1647 if (!delegate_) return MaybeHandle<JSObject>(); | 1688 if (!delegate_) return MaybeHandle<JSObject>(); |
1648 STACK_CHECK(isolate_, MaybeHandle<JSObject>()); | 1689 STACK_CHECK(isolate_, MaybeHandle<JSObject>()); |
1649 uint32_t id = next_id_++; | 1690 uint32_t id = next_id_++; |
1650 v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate_); | 1691 v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate_); |
1651 v8::Local<v8::Object> object; | 1692 v8::Local<v8::Object> object; |
1652 if (!delegate_->ReadHostObject(v8_isolate).ToLocal(&object)) { | 1693 if (!delegate_->ReadHostObject(v8_isolate).ToLocal(&object)) { |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1969 if (stack.size() != 1) { | 2010 if (stack.size() != 1) { |
1970 isolate_->Throw(*isolate_->factory()->NewError( | 2011 isolate_->Throw(*isolate_->factory()->NewError( |
1971 MessageTemplate::kDataCloneDeserializationError)); | 2012 MessageTemplate::kDataCloneDeserializationError)); |
1972 return MaybeHandle<Object>(); | 2013 return MaybeHandle<Object>(); |
1973 } | 2014 } |
1974 return scope.CloseAndEscape(stack[0]); | 2015 return scope.CloseAndEscape(stack[0]); |
1975 } | 2016 } |
1976 | 2017 |
1977 } // namespace internal | 2018 } // namespace internal |
1978 } // namespace v8 | 2019 } // namespace v8 |
OLD | NEW |