| Index: src/asmjs/asm-js.cc
|
| diff --git a/src/asmjs/asm-js.cc b/src/asmjs/asm-js.cc
|
| index c38c0537358b1f5f38606c05af9efcc568fedb2a..cbd69644a5e49ae81b4051f6b29cdce2d74c77ba 100644
|
| --- a/src/asmjs/asm-js.cc
|
| +++ b/src/asmjs/asm-js.cc
|
| @@ -67,6 +67,9 @@ bool IsStdlibMemberValid(i::Isolate* isolate, Handle<JSReceiver> stdlib,
|
| return true;
|
| }
|
| case wasm::AsmTyper::StandardMember::kNaN: {
|
| + if (stdlib.is_null()) {
|
| + return false;
|
| + }
|
| i::Handle<i::Name> name(isolate->factory()->InternalizeOneByteString(
|
| STATIC_CHAR_VECTOR("NaN")));
|
| i::MaybeHandle<i::Object> maybe_value =
|
| @@ -212,11 +215,8 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
|
| isolate, init, undefined, foreign_globals->length(), foreign_args_array);
|
| delete[] foreign_args_array;
|
|
|
| - if (retval.is_null()) {
|
| - thrower.Error(
|
| - "WASM.instantiateModuleFromAsm(): foreign init function failed");
|
| - return MaybeHandle<Object>();
|
| - }
|
| + DCHECK(!retval.is_null());
|
| +
|
| return maybe_module_object;
|
| }
|
|
|
|
|