Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/wasm/wasm-function-name-table.cc b/src/wasm/wasm-function-name-table.cc
index f082704..32c302d 100644
--- a/src/wasm/wasm-function-name-table.cc
+++ b/src/wasm/wasm-function-name-table.cc
@@ -14,59 +14,56 @@
// module, then the first (kIntSize * (N+1)) bytes are integer entries.
// The first integer entry encodes the number of functions in the module.
// The entries 1 to N contain offsets into the second part of this array.
+// If a function is unnamed (not to be confused with an empty name), then the
+// integer entry is the negative offset of the next function name.
// After these N+1 integer entries, the second part begins, which holds a
// concatenation of all function names.
-//
-// Returns undefined if the array length would not fit in an integer value
-Handle<Object> BuildFunctionNamesTable(Isolate* isolate, WasmModule* module) {
+Handle<ByteArray> BuildFunctionNamesTable(Isolate* isolate,
+ const WasmModule* module) {
uint64_t func_names_length = 0;
for (auto& func : module->functions) func_names_length += func.name_length;
int num_funcs_int = static_cast<int>(module->functions.size());
int current_offset = (num_funcs_int + 1) * kIntSize;
uint64_t total_array_length = current_offset + func_names_length;
int total_array_length_int = static_cast<int>(total_array_length);
- // Check for overflow. Just skip function names if it happens.
- if (total_array_length_int != total_array_length || num_funcs_int < 0 ||
- num_funcs_int != module->functions.size())
- return isolate->factory()->undefined_value();
+ // Check for overflow.
+ CHECK(total_array_length_int == total_array_length && num_funcs_int >= 0 &&
+ num_funcs_int == module->functions.size());
Handle<ByteArray> func_names_array =
isolate->factory()->NewByteArray(total_array_length_int, TENURED);
- if (func_names_array.is_null()) return isolate->factory()->undefined_value();
func_names_array->set_int(0, num_funcs_int);
int func_index = 0;
- for (WasmFunction& fun : module->functions) {
+ for (const WasmFunction& fun : module->functions) {
WasmName name = module->GetNameOrNull(&fun);
- func_names_array->copy_in(current_offset,
- reinterpret_cast<const byte*>(name.start()),
- name.length());
- func_names_array->set_int(func_index + 1, current_offset);
- current_offset += name.length();
+ if (name.start() == nullptr) {
+ func_names_array->set_int(func_index + 1, -current_offset);
+ } else {
+ func_names_array->copy_in(current_offset,
+ reinterpret_cast<const byte*>(name.start()),
+ name.length());
+ func_names_array->set_int(func_index + 1, current_offset);
+ current_offset += name.length();
+ }
++func_index;
}
return func_names_array;
}
-Handle<Object> GetWasmFunctionNameFromTable(Handle<ByteArray> func_names_array,
- uint32_t func_index) {
+MaybeHandle<String> GetWasmFunctionNameFromTable(
+ Handle<ByteArray> func_names_array, uint32_t func_index) {
uint32_t num_funcs = static_cast<uint32_t>(func_names_array->get_int(0));
DCHECK(static_cast<int>(num_funcs) >= 0);
- auto undefined = [&func_names_array]() -> Handle<Object> {
- return func_names_array->GetIsolate()->factory()->undefined_value();
- };
- if (func_index >= num_funcs) return undefined();
+ Factory* factory = func_names_array->GetIsolate()->factory();
+ if (func_index >= num_funcs) return {};
int offset = func_names_array->get_int(func_index + 1);
+ if (offset < 0) return {};
int next_offset = func_index == num_funcs - 1
? func_names_array->length()
- : func_names_array->get_int(func_index + 2);
+ : abs(func_names_array->get_int(func_index + 2));
ScopedVector<byte> buffer(next_offset - offset);
func_names_array->copy_out(offset, buffer.start(), next_offset - offset);
- if (!unibrow::Utf8::Validate(buffer.start(), buffer.length())) {
- return undefined();
- }
- MaybeHandle<Object> maybe_name =
- func_names_array->GetIsolate()->factory()->NewStringFromUtf8(
- Vector<const char>::cast(buffer));
- return maybe_name.is_null() ? undefined() : maybe_name.ToHandleChecked();
+ if (!unibrow::Utf8::Validate(buffer.start(), buffer.length())) return {};
+ return factory->NewStringFromUtf8(Vector<const char>::cast(buffer));
}
} // namespace wasm