Attachment #305621 for bug #170187

View Details Raw Unified Return to Bug 170187

| Differences between



2017-03-28  JF Bastien  <jfbastien@apple.com>

        WebAssembly: fix misc JS API implementation inconsistencies
        https://bugs.webkit.org/show_bug.cgi?id=170187

        Reviewed by NOBODY (OOPS!).

        * wasm/JSWebAssembly.cpp: validate / compile / instantiate should
        be on the prototype
        (JSC::JSWebAssembly::create):
        (JSC::JSWebAssembly::finishCreation):
        (JSC::webAssemblyCompileFunc): Deleted.
        (JSC::webAssemblyInstantiateFunc): Deleted.
        (JSC::webAssemblyValidateFunc): Deleted.
        * wasm/JSWebAssembly.h:
        * wasm/js/WebAssemblyMemoryPrototype.cpp: move validate / compile
        / instantiate here, and use auto-generated lookup tables
        (JSC::webAssemblyMemoryProtoFuncBuffer):
        (JSC::WebAssemblyMemoryPrototype::create):
        (JSC::WebAssemblyMemoryPrototype::finishCreation):
        * wasm/js/WebAssemblyMemoryPrototype.h:
        * wasm/js/WebAssemblyPrototype.cpp: use auto-generated lookup tables
        (JSC::webAssemblyValidateFunc):
        (JSC::webAssemblyCompileFunc):
        (JSC::webAssemblyInstantiateFunc):
        (JSC::webAssemblyFunctionValidate): Deleted.
        (JSC::webAssemblyFunctionCompile): Deleted.
        * wasm/js/WebAssemblyTablePrototype.cpp: make exception return idiomatic
        (JSC::webAssemblyTableProtoFuncGrow):
        (JSC::webAssemblyTableProtoFuncGet):
        (JSC::webAssemblyTableProtoFuncSet):
        (JSC::WebAssemblyTablePrototype::create):
        (JSC::WebAssemblyTablePrototype::finishCreation):
        * wasm/js/WebAssemblyTablePrototype.h:

2017-03-27  JF Bastien  <jfbastien@apple.com>

        WebAssembly: JSWebAssemblyCodeBlock.h belongs in JavaScriptCore/wasm/js not JavaScriptCore/wasm



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions


#if ENABLE(WEBASSEMBLY)

#include "Exception.h"
#include "FunctionPrototype.h"
#include "JSCInlines.h"
#include "JSPromiseDeferred.h"
#include "JSWebAssemblyHelpers.h"
#include "ObjectConstructor.h"
#include "WasmPlan.h"
#include "WebAssemblyModuleConstructor.h"

namespace JSC {

STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWebAssembly);

EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState*);
EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState*);
EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState*);

EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto catchScope = DECLARE_CATCH_SCOPE(vm);

    JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
    RETURN_IF_EXCEPTION(catchScope, encodedJSValue());

    // FIXME: Make this truly asynchronous:
    // https://bugs.webkit.org/show_bug.cgi?id=166016
    JSValue module = WebAssemblyModuleConstructor::createModule(exec, exec->argument(0), exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
    if (Exception* exception = catchScope.exception()) {
        catchScope.clearException();
        promise->reject(exec, exception->value());
        return JSValue::encode(promise->promise());
    }

    promise->resolve(exec, module);
    return JSValue::encode(promise->promise());
}

EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto catchScope = DECLARE_CATCH_SCOPE(vm);

    // FIXME: Make this API truly asynchronous: https://bugs.webkit.org/show_bug.cgi?id=169187

    JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
    RETURN_IF_EXCEPTION(catchScope, encodedJSValue());

    auto reject = [&] () {
        Exception* exception = catchScope.exception();
        ASSERT(exception);
        catchScope.clearException();
        promise->reject(exec, exception->value());
        return JSValue::encode(promise->promise());
    };

    JSValue importArgument = exec->argument(1);
    JSObject* importObject = importArgument.getObject();
    if (!importArgument.isUndefined() && !importObject) {
        promise->reject(exec, createTypeError(exec,
            ASCIILiteral("second argument to WebAssembly.instantiate must be undefined or an Object"), defaultSourceAppender, runtimeTypeForValue(importArgument)));
        return JSValue::encode(promise->promise());
    }

    JSValue firstArgument = exec->argument(0);
    JSValue module;
    bool firstArgumentIsModule = false;
    if (firstArgument.inherits(vm, JSWebAssemblyModule::info())) {
        firstArgumentIsModule = true;
        module = firstArgument;
    } else {
        module = WebAssemblyModuleConstructor::createModule(exec, firstArgument, exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
        if (catchScope.exception())
            return reject();
    }

    JSWebAssemblyInstance* instance = WebAssemblyInstanceConstructor::createInstance(exec, jsCast<JSWebAssemblyModule*>(module), importObject, exec->lexicalGlobalObject()->WebAssemblyInstanceStructure());
    if (catchScope.exception())
        return reject();

    if (firstArgumentIsModule)
        promise->resolve(exec, instance);
    else {
        JSObject* result = constructEmptyObject(exec);
        result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("module")), module);
        result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("instance")), instance);
        promise->resolve(exec, result);
    }

    return JSValue::encode(promise->promise());
}

EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);

    size_t byteOffset;
    size_t byteSize;
    uint8_t* base = getWasmBufferFromValue(exec, exec->argument(0), byteOffset, byteSize);
    RETURN_IF_EXCEPTION(scope, encodedJSValue());
    Wasm::Plan plan(&vm, base + byteOffset, byteSize);
    // FIXME: We might want to throw an OOM exception here if we detect that something will OOM.
    // https://bugs.webkit.org/show_bug.cgi?id=166015
    return JSValue::encode(jsBoolean(plan.parseAndValidateModule()));
}

const ClassInfo JSWebAssembly::s_info = { "WebAssembly", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWebAssembly) };

STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWebAssembly);

JSWebAssembly* JSWebAssembly::create(VM& vm, JSGlobalObject*, Structure* structure)
{
    auto* object = new (NotNull, allocateCell<JSWebAssembly>(vm.heap)) JSWebAssembly(vm, structure);
    object->finishCreation(vm);
    return object;
}


    return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
}

void JSWebAssembly::finishCreation(VM& vm)
{
    Base::finishCreation(vm);
    ASSERT(inherits(vm, info()));
    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("validate", webAssemblyValidateFunc, DontEnum, 1);
    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("compile", webAssemblyCompileFunc, DontEnum, 1);
    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("instantiate", webAssemblyInstantiateFunc, DontEnum, 1);
}

JSWebAssembly::JSWebAssembly(VM& vm, Structure* structure)



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

    DECLARE_INFO;

protected:
    void finishCreation(VM&);

private:
    JSWebAssembly(VM&, Structure*);



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions


namespace JSC {
static EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncGrow(ExecState*);
static EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncBuffer(ExecState*);
}

#include "WebAssemblyMemoryPrototype.lut.h"


/* Source for WebAssemblyMemoryPrototype.lut.h
@begin prototypeTableWebAssemblyMemory
 grow   webAssemblyMemoryProtoFuncGrow   DontEnum|Function 1
 buffer webAssemblyMemoryProtoFuncBuffer DontEnum|Accessor 0
@end
*/

EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncBuffer(ExecState*);

ALWAYS_INLINE JSWebAssemblyMemory* getMemory(ExecState* exec, JSValue value)
{
    VM& vm = exec->vm();

    return memory;
}

EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncBuffer(ExecState* exec)
{
    VM& vm = exec->vm();
    auto throwScope = DECLARE_THROW_SCOPE(vm);

    JSWebAssemblyMemory* memory = getMemory(exec, exec->thisValue()); 
    RETURN_IF_EXCEPTION(throwScope, { });
    return JSValue::encode(memory->buffer(exec->vm(), exec->lexicalGlobalObject()));
}

EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncGrow(ExecState* exec)
{
    VM& vm = exec->vm();

    return JSValue::encode(jsNumber(result.pageCount()));
}

EncodedJSValue JSC_HOST_CALL webAssemblyMemoryProtoFuncBuffer(ExecState* exec)
{
    VM& vm = exec->vm();
    auto throwScope = DECLARE_THROW_SCOPE(vm);

    JSWebAssemblyMemory* memory = getMemory(exec, exec->thisValue()); 
    RETURN_IF_EXCEPTION(throwScope, { });
    return JSValue::encode(memory->buffer(exec->vm(), exec->lexicalGlobalObject()));
}

WebAssemblyMemoryPrototype* WebAssemblyMemoryPrototype::create(VM& vm, JSGlobalObject*, Structure* structure)
{
    auto* object = new (NotNull, allocateCell<WebAssemblyMemoryPrototype>(vm.heap)) WebAssemblyMemoryPrototype(vm, structure);
    object->finishCreation(vm);
    return object;
}


    return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
}

void WebAssemblyMemoryPrototype::finishCreation(VM& vm)
{
    Base::finishCreation(vm);
    ASSERT(inherits(vm, info()));
}

WebAssemblyMemoryPrototype::WebAssemblyMemoryPrototype(VM& vm, Structure* structure)



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

    DECLARE_INFO;

protected:
    void finishCreation(VM&);

private:
    WebAssemblyMemoryPrototype(VM&, Structure*);



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions


#if ENABLE(WEBASSEMBLY)

#include "Exception.h"
#include "FunctionPrototype.h"
#include "JSCInlines.h"
#include "JSPromiseDeferred.h"
#include "JSWebAssemblyHelpers.h"
#include "JSWebAssemblyInstance.h"
#include "JSWebAssemblyModule.h"
#include "ObjectConstructor.h"
#include "WasmPlan.h"
#include "WebAssemblyInstanceConstructor.h"
#include "WebAssemblyModuleConstructor.h"

namespace JSC {
static EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState*);
static EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState*);
static EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState*);
    VM& vm = exec->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("WebAssembly doesn't yet implement the validate function property"))));
}

static EncodedJSValue JSC_HOST_CALL webAssemblyFunctionCompile(ExecState* exec)
{
    VM& vm = exec->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("WebAssembly doesn't yet implement the compile function property"))));
}

}

#include "WebAssemblyPrototype.lut.h"


/* Source for WebAssemblyPrototype.lut.h
 @begin prototypeTableWebAssembly
 validate    webAssemblyValidateFunc    DontEnum|Function 1
 compile     webAssemblyCompileFunc     DontEnum|Function 1
 instantiate webAssemblyInstantiateFunc DontEnum|Function 1
 @end
 */

EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);

    size_t byteOffset;
    size_t byteSize;
    uint8_t* base = getWasmBufferFromValue(exec, exec->argument(0), byteOffset, byteSize);
    RETURN_IF_EXCEPTION(scope, encodedJSValue());
    Wasm::Plan plan(&vm, base + byteOffset, byteSize);
    // FIXME: We might want to throw an OOM exception here if we detect that something will OOM.
    // https://bugs.webkit.org/show_bug.cgi?id=166015
    return JSValue::encode(jsBoolean(plan.parseAndValidateModule()));
}

EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto catchScope = DECLARE_CATCH_SCOPE(vm);

    JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
    RETURN_IF_EXCEPTION(catchScope, encodedJSValue());

    // FIXME: Make this truly asynchronous:
    // https://bugs.webkit.org/show_bug.cgi?id=166016
    JSValue module = WebAssemblyModuleConstructor::createModule(exec, exec->argument(0), exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
    if (Exception* exception = catchScope.exception()) {
        catchScope.clearException();
        promise->reject(exec, exception->value());
        return JSValue::encode(promise->promise());
    }

    promise->resolve(exec, module);
    return JSValue::encode(promise->promise());
}

EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState* exec)
{
    VM& vm = exec->vm();
    auto catchScope = DECLARE_CATCH_SCOPE(vm);

    // FIXME: Make this API truly asynchronous: https://bugs.webkit.org/show_bug.cgi?id=169187

    JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
    RETURN_IF_EXCEPTION(catchScope, encodedJSValue());

    auto reject = [&] () {
        Exception* exception = catchScope.exception();
        ASSERT(exception);
        catchScope.clearException();
        promise->reject(exec, exception->value());
        return JSValue::encode(promise->promise());
    };

    JSValue importArgument = exec->argument(1);
    JSObject* importObject = importArgument.getObject();
    if (!importArgument.isUndefined() && !importObject) {
        promise->reject(exec, createTypeError(exec,
            ASCIILiteral("second argument to WebAssembly.instantiate must be undefined or an Object"), defaultSourceAppender, runtimeTypeForValue(importArgument)));
        return JSValue::encode(promise->promise());
    }

    JSValue firstArgument = exec->argument(0);
    JSValue module;
    bool firstArgumentIsModule = false;
    if (firstArgument.inherits(vm, JSWebAssemblyModule::info())) {
        firstArgumentIsModule = true;
        module = firstArgument;
    } else {
        module = WebAssemblyModuleConstructor::createModule(exec, firstArgument, exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
        if (catchScope.exception())
            return reject();
    }

    JSWebAssemblyInstance* instance = WebAssemblyInstanceConstructor::createInstance(exec, jsCast<JSWebAssemblyModule*>(module), importObject, exec->lexicalGlobalObject()->WebAssemblyInstanceStructure());
    if (catchScope.exception())
        return reject();

    if (firstArgumentIsModule)
        promise->resolve(exec, instance);
    else {
        JSObject* result = constructEmptyObject(exec);
        result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("module")), module);
        result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("instance")), instance);
        promise->resolve(exec, result);
    }

    return JSValue::encode(promise->promise());
}

WebAssemblyPrototype* WebAssemblyPrototype::create(VM& vm, JSGlobalObject*, Structure* structure)
{
    auto* object = new (NotNull, allocateCell<WebAssemblyPrototype>(vm.heap)) WebAssemblyPrototype(vm, structure);

Lines 1-5 a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec1
- a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp -34 / +24 lines
1	/*	1	/*
2	* Copyright (C) 2016 Apple Inc. All rights reserved.	2	* Copyright (C) 2016-2017 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 33-38 a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec2
33	#include "JSWebAssemblyHelpers.h"	33	#include "JSWebAssemblyHelpers.h"
34	#include "JSWebAssemblyTable.h"	34	#include "JSWebAssemblyTable.h"
35		35
		36	namespace JSC {
		37	static EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncLength(ExecState*);
		38	static EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGrow(ExecState*);
		39	static EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGet(ExecState*);
		40	static EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncSet(ExecState*);
		41	}
		42
36	#include "WebAssemblyTablePrototype.lut.h"	43	#include "WebAssemblyTablePrototype.lut.h"
37		44
38	namespace JSC {	45	namespace JSC {
Lines 41-46 const ClassInfo WebAssemblyTablePrototype::s_info = { "WebAssembly.Table.prototy a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec3
41		48
42	/* Source for WebAssemblyTablePrototype.lut.h	49	/* Source for WebAssemblyTablePrototype.lut.h
43	@begin prototypeTableWebAssemblyTable	50	@begin prototypeTableWebAssemblyTable
		51	length webAssemblyTableProtoFuncLength DontEnum\|Accessor 0
		52	grow webAssemblyTableProtoFuncGrow DontEnum\|Function 1
		53	get webAssemblyTableProtoFuncGet DontEnum\|Function 1
		54	set webAssemblyTableProtoFuncSet DontEnum\|Function 2
44	@end	55	@end
45	*/	56	*/
46		57
Lines 56-66 static ALWAYS_INLINE JSWebAssemblyTable* getTable(ExecState* exec, VM& vm, JSVal a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec4
56	return result;	67	return result;
57	}	68	}
58		69
59	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncLength(ExecState*);
60	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGrow(ExecState*);
61	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGet(ExecState*);
62	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncSet(ExecState*);
63
64	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncLength(ExecState* exec)	70	EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncLength(ExecState* exec)
65	{	71	{
66	VM& vm = exec->vm();	72	VM& vm = exec->vm();
Lines 81-91 EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGrow(ExecState* exec) a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec5
81		87
82	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));	88	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));
83	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());	89	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
84	if (!table->grow(index)) {	90	if (!table->grow(index))
85	throwException(exec, throwScope,	91	return JSValue::encode(throwException(exec, throwScope, createTypeError(exec, ASCIILiteral("WebAssembly.Table.prototype.grow could not grow the table"))));
86	createTypeError(exec, ASCIILiteral("WebAssembly.Table.prototype.grow could not grow the table")));
87	return { };
88	}
89		92
90	return JSValue::encode(jsUndefined());	93	return JSValue::encode(jsUndefined());
91	}	94	}
Lines 100-110 EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncGet(ExecState* exec) a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec6
100		103
101	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));	104	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));
102	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());	105	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
103	if (index >= table->size()) {	106	if (index >= table->size())
104	throwException(exec, throwScope,	107	return JSValue::encode(throwException(exec, throwScope, createRangeError(exec, ASCIILiteral("WebAssembly.Table.prototype.get expects an integer less than the size of the table"))));
105	createRangeError(exec, ASCIILiteral("WebAssembly.Table.prototype.get expects an integer less than the size of the table")));
106	return { };
107	}
108		108
109	if (JSObject* result = table->getFunction(index))	109	if (JSObject* result = table->getFunction(index))
110	return JSValue::encode(result);	110	return JSValue::encode(result);
Lines 122-141 EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncSet(ExecState* exec) a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec7
122	JSValue value = exec->argument(1);	122	JSValue value = exec->argument(1);
123	WebAssemblyFunction* wasmFunction;	123	WebAssemblyFunction* wasmFunction;
124	WebAssemblyWrapperFunction* wasmWrapperFunction;	124	WebAssemblyWrapperFunction* wasmWrapperFunction;
125	if (!value.isNull() && !isWebAssemblyHostFunction(vm, value, wasmFunction, wasmWrapperFunction)) {	125	if (!value.isNull() && !isWebAssemblyHostFunction(vm, value, wasmFunction, wasmWrapperFunction))
126	throwException(exec, throwScope,	126	return JSValue::encode(throwException(exec, throwScope, createTypeError(exec, ASCIILiteral("WebAssembly.Table.prototype.set expects the second argument to be null or an instance of WebAssembly.Function"))));
127	createTypeError(exec, ASCIILiteral("WebAssembly.Table.prototype.set expects the second argument to be null or an instance of WebAssembly.Function")));
128	return { };
129	}
130		127
131	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));	128	uint32_t index = toNonWrappingUint32(exec, exec->argument(0));
132	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());	129	RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
133		130
134	if (index >= table->size()) {	131	if (index >= table->size())
135	throwException(exec, throwScope,	132	return JSValue::encode(throwException(exec, throwScope, createRangeError(exec, ASCIILiteral("WebAssembly.Table.prototype.set expects an integer less than the size of the table"))));
136	createRangeError(exec, ASCIILiteral("WebAssembly.Table.prototype.set expects an integer less than the size of the table")));
137	return { };
138	}
139		133
140	if (value.isNull())	134	if (value.isNull())
141	table->clearFunction(index);	135	table->clearFunction(index);
Lines 151-160 EncodedJSValue JSC_HOST_CALL webAssemblyTableProtoFuncSet(ExecState* exec) a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec8
151	return JSValue::encode(jsUndefined());	145	return JSValue::encode(jsUndefined());
152	}	146	}
153		147
154	WebAssemblyTablePrototype* WebAssemblyTablePrototype::create(VM& vm, JSGlobalObject* globalObject, Structure* structure)	148	WebAssemblyTablePrototype* WebAssemblyTablePrototype::create(VM& vm, JSGlobalObject, Structure structure)
155	{	149	{
156	auto* object = new (NotNull, allocateCell<WebAssemblyTablePrototype>(vm.heap)) WebAssemblyTablePrototype(vm, structure);	150	auto* object = new (NotNull, allocateCell<WebAssemblyTablePrototype>(vm.heap)) WebAssemblyTablePrototype(vm, structure);
157	object->finishCreation(vm, globalObject);	151	object->finishCreation(vm);
158	return object;	152	return object;
159	}	153	}
160		154
Lines 163-176 Structure* WebAssemblyTablePrototype::createStructure(VM& vm, JSGlobalObject* gl a/Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp_sec9
163	return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());	157	return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
164	}	158	}
165		159
166	void WebAssemblyTablePrototype::finishCreation(VM& vm, JSGlobalObject* globalObject)	160	void WebAssemblyTablePrototype::finishCreation(VM& vm)
167	{	161	{
168	Base::finishCreation(vm);	162	Base::finishCreation(vm);
169		163	ASSERT(inherits(vm, info()));
170	JSC_NATIVE_GETTER("length", webAssemblyTableProtoFuncLength, DontEnum \| Accessor);
171	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("grow", webAssemblyTableProtoFuncGrow, DontEnum, 1);
172	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("get", webAssemblyTableProtoFuncGet, DontEnum, 1);
173	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("set", webAssemblyTableProtoFuncSet, DontEnum, 2);
174	}	164	}
175		165
176	WebAssemblyTablePrototype::WebAssemblyTablePrototype(VM& vm, Structure* structure)	166	WebAssemblyTablePrototype::WebAssemblyTablePrototype(VM& vm, Structure* structure)



/*
 * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions

    DECLARE_INFO;

protected:
    void finishCreation(VM&);

private:
    WebAssemblyTablePrototype(VM&, Structure*);
- 

Return to Bug 170187

Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
- a/Source/JavaScriptCore/ChangeLog +35 lines
		1	2017-03-28 JF Bastien <jfbastien@apple.com>
		2
		3	WebAssembly: fix misc JS API implementation inconsistencies
		4	https://bugs.webkit.org/show_bug.cgi?id=170187
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wasm/JSWebAssembly.cpp: validate / compile / instantiate should
		9	be on the prototype
		10	(JSC::JSWebAssembly::create):
		11	(JSC::JSWebAssembly::finishCreation):
		12	(JSC::webAssemblyCompileFunc): Deleted.
		13	(JSC::webAssemblyInstantiateFunc): Deleted.
		14	(JSC::webAssemblyValidateFunc): Deleted.
		15	* wasm/JSWebAssembly.h:
		16	* wasm/js/WebAssemblyMemoryPrototype.cpp: move validate / compile
		17	/ instantiate here, and use auto-generated lookup tables
		18	(JSC::webAssemblyMemoryProtoFuncBuffer):
		19	(JSC::WebAssemblyMemoryPrototype::create):
		20	(JSC::WebAssemblyMemoryPrototype::finishCreation):
		21	* wasm/js/WebAssemblyMemoryPrototype.h:
		22	* wasm/js/WebAssemblyPrototype.cpp: use auto-generated lookup tables
		23	(JSC::webAssemblyValidateFunc):
		24	(JSC::webAssemblyCompileFunc):
		25	(JSC::webAssemblyInstantiateFunc):
		26	(JSC::webAssemblyFunctionValidate): Deleted.
		27	(JSC::webAssemblyFunctionCompile): Deleted.
		28	* wasm/js/WebAssemblyTablePrototype.cpp: make exception return idiomatic
		29	(JSC::webAssemblyTableProtoFuncGrow):
		30	(JSC::webAssemblyTableProtoFuncGet):
		31	(JSC::webAssemblyTableProtoFuncSet):
		32	(JSC::WebAssemblyTablePrototype::create):
		33	(JSC::WebAssemblyTablePrototype::finishCreation):
		34	* wasm/js/WebAssemblyTablePrototype.h:
		35
1	2017-03-27 JF Bastien <jfbastien@apple.com>	36	2017-03-27 JF Bastien <jfbastien@apple.com>
2		37
3	WebAssembly: JSWebAssemblyCodeBlock.h belongs in JavaScriptCore/wasm/js not JavaScriptCore/wasm	38	WebAssembly: JSWebAssemblyCodeBlock.h belongs in JavaScriptCore/wasm/js not JavaScriptCore/wasm

Lines 1-5 a/Source/JavaScriptCore/wasm/JSWebAssembly.cpp_sec1
- a/Source/JavaScriptCore/wasm/JSWebAssembly.cpp -110 / +6 lines
1	/*	1	/*
2	* Copyright (C) 2016 Apple Inc. All rights reserved.	2	* Copyright (C) 2016-2017 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 28-146 a/Source/JavaScriptCore/wasm/JSWebAssembly.cpp_sec2
28		28
29	#if ENABLE(WEBASSEMBLY)	29	#if ENABLE(WEBASSEMBLY)
30		30
31	#include "Exception.h"
32	#include "FunctionPrototype.h"
33	#include "JSCInlines.h"	31	#include "JSCInlines.h"
34	#include "JSPromiseDeferred.h"
35	#include "JSWebAssemblyHelpers.h"
36	#include "ObjectConstructor.h"
37	#include "WasmPlan.h"
38	#include "WebAssemblyModuleConstructor.h"
39		32
40	namespace JSC {	33	namespace JSC {
41		34
42	STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWebAssembly);
43
44	EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState*);
45	EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState*);
46	EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState*);
47
48	EncodedJSValue JSC_HOST_CALL webAssemblyCompileFunc(ExecState* exec)
49	{
50	VM& vm = exec->vm();
51	auto catchScope = DECLARE_CATCH_SCOPE(vm);
52
53	JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
54	RETURN_IF_EXCEPTION(catchScope, encodedJSValue());
55
56	// FIXME: Make this truly asynchronous:
57	// https://bugs.webkit.org/show_bug.cgi?id=166016
58	JSValue module = WebAssemblyModuleConstructor::createModule(exec, exec->argument(0), exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
59	if (Exception* exception = catchScope.exception()) {
60	catchScope.clearException();
61	promise->reject(exec, exception->value());
62	return JSValue::encode(promise->promise());
63	}
64
65	promise->resolve(exec, module);
66	return JSValue::encode(promise->promise());
67	}
68
69	EncodedJSValue JSC_HOST_CALL webAssemblyInstantiateFunc(ExecState* exec)
70	{
71	VM& vm = exec->vm();
72	auto catchScope = DECLARE_CATCH_SCOPE(vm);
73
74	// FIXME: Make this API truly asynchronous: https://bugs.webkit.org/show_bug.cgi?id=169187
75
76	JSPromiseDeferred* promise = JSPromiseDeferred::create(exec, exec->lexicalGlobalObject());
77	RETURN_IF_EXCEPTION(catchScope, encodedJSValue());
78
79	auto reject = [&] () {
80	Exception* exception = catchScope.exception();
81	ASSERT(exception);
82	catchScope.clearException();
83	promise->reject(exec, exception->value());
84	return JSValue::encode(promise->promise());
85	};
86
87	JSValue importArgument = exec->argument(1);
88	JSObject* importObject = importArgument.getObject();
89	if (!importArgument.isUndefined() && !importObject) {
90	promise->reject(exec, createTypeError(exec,
91	ASCIILiteral("second argument to WebAssembly.instantiate must be undefined or an Object"), defaultSourceAppender, runtimeTypeForValue(importArgument)));
92	return JSValue::encode(promise->promise());
93	}
94
95	JSValue firstArgument = exec->argument(0);
96	JSValue module;
97	bool firstArgumentIsModule = false;
98	if (firstArgument.inherits(vm, JSWebAssemblyModule::info())) {
99	firstArgumentIsModule = true;
100	module = firstArgument;
101	} else {
102	module = WebAssemblyModuleConstructor::createModule(exec, firstArgument, exec->lexicalGlobalObject()->WebAssemblyModuleStructure());
103	if (catchScope.exception())
104	return reject();
105	}
106
107	JSWebAssemblyInstance* instance = WebAssemblyInstanceConstructor::createInstance(exec, jsCast<JSWebAssemblyModule*>(module), importObject, exec->lexicalGlobalObject()->WebAssemblyInstanceStructure());
108	if (catchScope.exception())
109	return reject();
110
111	if (firstArgumentIsModule)
112	promise->resolve(exec, instance);
113	else {
114	JSObject* result = constructEmptyObject(exec);
115	result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("module")), module);
116	result->putDirect(vm, Identifier::fromString(&vm, ASCIILiteral("instance")), instance);
117	promise->resolve(exec, result);
118	}
119
120	return JSValue::encode(promise->promise());
121	}
122
123	EncodedJSValue JSC_HOST_CALL webAssemblyValidateFunc(ExecState* exec)
124	{
125	VM& vm = exec->vm();
126	auto scope = DECLARE_THROW_SCOPE(vm);
127
128	size_t byteOffset;
129	size_t byteSize;
130	uint8_t* base = getWasmBufferFromValue(exec, exec->argument(0), byteOffset, byteSize);
131	RETURN_IF_EXCEPTION(scope, encodedJSValue());
132	Wasm::Plan plan(&vm, base + byteOffset, byteSize);
133	// FIXME: We might want to throw an OOM exception here if we detect that something will OOM.
134	// https://bugs.webkit.org/show_bug.cgi?id=166015
135	return JSValue::encode(jsBoolean(plan.parseAndValidateModule()));
136	}
137
138	const ClassInfo JSWebAssembly::s_info = { "WebAssembly", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWebAssembly) };	35	const ClassInfo JSWebAssembly::s_info = { "WebAssembly", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWebAssembly) };
139		36
140	JSWebAssembly* JSWebAssembly::create(VM& vm, JSGlobalObject* globalObject, Structure* structure)	37	STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSWebAssembly);
		38
		39	JSWebAssembly* JSWebAssembly::create(VM& vm, JSGlobalObject, Structure structure)
141	{	40	{
142	auto* object = new (NotNull, allocateCell<JSWebAssembly>(vm.heap)) JSWebAssembly(vm, structure);	41	auto* object = new (NotNull, allocateCell<JSWebAssembly>(vm.heap)) JSWebAssembly(vm, structure);
143	object->finishCreation(vm, globalObject);	42	object->finishCreation(vm);
144	return object;	43	return object;
145	}	44	}
146		45
Lines 149-161 Structure* JSWebAssembly::createStructure(VM& vm, JSGlobalObject* globalObject, a/Source/JavaScriptCore/wasm/JSWebAssembly.cpp_sec3
149	return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());	48	return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
150	}	49	}
151		50
152	void JSWebAssembly::finishCreation(VM& vm, JSGlobalObject* globalObject)	51	void JSWebAssembly::finishCreation(VM& vm)
153	{	52	{
154	Base::finishCreation(vm);	53	Base::finishCreation(vm);
155	ASSERT(inherits(vm, info()));	54	ASSERT(inherits(vm, info()));
156	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("validate", webAssemblyValidateFunc, DontEnum, 1);
157	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("compile", webAssemblyCompileFunc, DontEnum, 1);
158	JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("instantiate", webAssemblyInstantiateFunc, DontEnum, 1);
159	}	55	}
160		56
161	JSWebAssembly::JSWebAssembly(VM& vm, Structure* structure)	57	JSWebAssembly::JSWebAssembly(VM& vm, Structure* structure)