| Index: src/wasm/wasm-js.cc
|
| diff --git a/src/wasm/wasm-js.cc b/src/wasm/wasm-js.cc
|
| index 67e318983a22f93f890ccded6ea9dbd0f8b60f94..fe80ddf90cffe355ca97d34ee0ee321a67f222d6 100644
|
| --- a/src/wasm/wasm-js.cc
|
| +++ b/src/wasm/wasm-js.cc
|
| @@ -472,7 +472,7 @@ void WebAssemblyInstantiate(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
|
|
| bool GetIntegerProperty(v8::Isolate* isolate, ErrorThrower* thrower,
|
| Local<Context> context, Local<v8::Object> object,
|
| - Local<String> property, int* result,
|
| + Local<String> property, int64_t* result,
|
| int64_t lower_bound, uint64_t upper_bound) {
|
| v8::MaybeLocal<v8::Value> maybe = object->Get(context, property);
|
| v8::Local<v8::Value> value;
|
| @@ -525,14 +525,14 @@ void WebAssemblyTable(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| }
|
| }
|
| // The descriptor's 'initial'.
|
| - int initial = 0;
|
| + int64_t initial = 0;
|
| if (!GetIntegerProperty(isolate, &thrower, context, descriptor,
|
| v8_str(isolate, "initial"), &initial, 0,
|
| i::FLAG_wasm_max_table_size)) {
|
| return;
|
| }
|
| // The descriptor's 'maximum'.
|
| - int maximum = -1;
|
| + int64_t maximum = -1;
|
| Local<String> maximum_key = v8_str(isolate, "maximum");
|
| Maybe<bool> has_maximum = descriptor->Has(context, maximum_key);
|
|
|
| @@ -545,8 +545,8 @@ void WebAssemblyTable(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| }
|
|
|
| i::Handle<i::FixedArray> fixed_array;
|
| - i::Handle<i::JSObject> table_obj =
|
| - i::WasmTableObject::New(i_isolate, initial, maximum, &fixed_array);
|
| + i::Handle<i::JSObject> table_obj = i::WasmTableObject::New(
|
| + i_isolate, static_cast<uint32_t>(initial), maximum, &fixed_array);
|
| v8::ReturnValue<v8::Value> return_value = args.GetReturnValue();
|
| return_value.Set(Utils::ToLocal(table_obj));
|
| }
|
| @@ -563,14 +563,14 @@ void WebAssemblyMemory(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| Local<Context> context = isolate->GetCurrentContext();
|
| Local<v8::Object> descriptor = args[0]->ToObject(context).ToLocalChecked();
|
| // The descriptor's 'initial'.
|
| - int initial = 0;
|
| + int64_t initial = 0;
|
| if (!GetIntegerProperty(isolate, &thrower, context, descriptor,
|
| v8_str(isolate, "initial"), &initial, 0,
|
| i::FLAG_wasm_max_mem_pages)) {
|
| return;
|
| }
|
| // The descriptor's 'maximum'.
|
| - int maximum = -1;
|
| + int64_t maximum = -1;
|
| Local<String> maximum_key = v8_str(isolate, "maximum");
|
| Maybe<bool> has_maximum = descriptor->Has(context, maximum_key);
|
|
|
| @@ -589,8 +589,8 @@ void WebAssemblyMemory(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| thrower.RangeError("could not allocate memory");
|
| return;
|
| }
|
| - i::Handle<i::JSObject> memory_obj =
|
| - i::WasmMemoryObject::New(i_isolate, buffer, maximum);
|
| + i::Handle<i::JSObject> memory_obj = i::WasmMemoryObject::New(
|
| + i_isolate, buffer, static_cast<int32_t>(maximum));
|
| args.GetReturnValue().Set(Utils::ToLocal(memory_obj));
|
| }
|
|
|
| @@ -638,9 +638,8 @@ void WebAssemblyTableGrow(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| }
|
| new_size64 += old_size;
|
|
|
| - int64_t max_size64 = receiver->maximum_length();
|
| - if (max_size64 < 0 ||
|
| - max_size64 > static_cast<int64_t>(i::FLAG_wasm_max_table_size)) {
|
| + int64_t max_size64 = receiver->maximum_length()->Number();
|
| + if (max_size64 < 0 || max_size64 > i::FLAG_wasm_max_table_size) {
|
| max_size64 = i::FLAG_wasm_max_table_size;
|
| }
|
|
|
|
|