Skip to content

wasm2js: Fix null handling and RefAsNonNull #6656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kripken merged 25 commits into from
Jun 12, 2024
Merged

wasm2js: Fix null handling and RefAsNonNull #6656

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
854b13e
work
kripken Jun 10, 2024
421f475
work
kripken Jun 11, 2024
45dfb55
work
kripken Jun 11, 2024
0f1d998
work
kripken Jun 11, 2024
6ab13e0
prep
kripken Jun 11, 2024
eef7e4b
prep
kripken Jun 11, 2024
0e98b3f
prep
kripken Jun 11, 2024
ebc01d4
prep
kripken Jun 11, 2024
709990f
prep
kripken Jun 11, 2024
bb61473
prep
kripken Jun 11, 2024
670ee9b
prep
kripken Jun 11, 2024
9ea29ea
work
kripken Jun 11, 2024
d92ac97
work
kripken Jun 11, 2024
d8f6f81
work
kripken Jun 11, 2024
948803d
work
kripken Jun 11, 2024
468d830
work
kripken Jun 11, 2024
75133c4
fix
kripken Jun 11, 2024
76f8841
werk
kripken Jun 11, 2024
3a58ff0
work
kripken Jun 11, 2024
d475866
work
kripken Jun 11, 2024
c841df1
Merge remote-tracking branch 'origin/main' into wasm2js.tables.2
kripken Jun 11, 2024
03ac6c2
fix
kripken Jun 11, 2024
74b6afb
fix
kripken Jun 12, 2024
c1146fe
format
kripken Jun 12, 2024
2b4bcc1
NULL_
kripken Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/emscripten-optimizer/optimizer-shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <limits>

#include "optimizer.h"
#include "shared-constants.h"
#include "support/safe_integer.h"

using namespace cashew;
Expand All @@ -33,30 +34,25 @@ Ref makeJsCoercedZero(JsType type) {
switch (type) {
case JS_INT:
return ValueBuilder::makeNum(0);
break;
case JS_DOUBLE:
return ValueBuilder::makeUnary(PLUS, ValueBuilder::makeNum(0));
break;
case JS_FLOAT: {
if (!JS_FLOAT_ZERO.isNull()) {
return ValueBuilder::makeName(JS_FLOAT_ZERO);
} else {
return ValueBuilder::makeCall(MATH_FROUND, ValueBuilder::makeNum(0));
}
break;
}
case JS_FLOAT32X4: {
return ValueBuilder::makeCall(SIMD_FLOAT32X4,
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0));
break;
}
case JS_FLOAT64X2: {
return ValueBuilder::makeCall(
SIMD_FLOAT64X2, ValueBuilder::makeNum(0), ValueBuilder::makeNum(0));
break;
}
case JS_INT8X16: {
return ValueBuilder::makeCall(SIMD_INT8X16,
Expand All @@ -76,7 +72,6 @@ Ref makeJsCoercedZero(JsType type) {
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0));
break;
}
case JS_INT16X8: {
return ValueBuilder::makeCall(SIMD_INT16X8,
Expand All @@ -88,15 +83,16 @@ Ref makeJsCoercedZero(JsType type) {
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0));
break;
}
case JS_INT32X4: {
return ValueBuilder::makeCall(SIMD_INT32X4,
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0),
ValueBuilder::makeNum(0));
break;
}
case JS_REF: {
return ValueBuilder::makeName(wasm::NULL_);
}
default:
assert(0);
Expand Down
46 changes: 27 additions & 19 deletions src/wasm2js.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,44 +846,45 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
}

void Wasm2JSBuilder::addGlobal(Ref ast, Global* global) {
if (auto* const_ = global->init->dynCast<Const>()) {
Ref theValue;
Ref theVar = ValueBuilder::makeVar();
ast->push_back(theVar);

auto* init = global->init;
Ref value;

if (auto* const_ = init->dynCast<Const>()) {
TODO_SINGLE_COMPOUND(const_->type);
switch (const_->type.getBasic()) {
case Type::i32: {
theValue = ValueBuilder::makeInt(const_->value.geti32());
value = ValueBuilder::makeInt(const_->value.geti32());
break;
}
case Type::f32: {
theValue = ValueBuilder::makeCall(
value = ValueBuilder::makeCall(
MATH_FROUND,
makeJsCoercion(ValueBuilder::makeDouble(const_->value.getf32()),
JS_DOUBLE));
break;
}
case Type::f64: {
theValue = makeJsCoercion(
ValueBuilder::makeDouble(const_->value.getf64()), JS_DOUBLE);
value = makeJsCoercion(ValueBuilder::makeDouble(const_->value.getf64()),
JS_DOUBLE);
break;
}
default: {
assert(false && "Top const type not supported");
}
}
Ref theVar = ValueBuilder::makeVar();
ast->push_back(theVar);
ValueBuilder::appendToVar(
theVar, fromName(global->name, NameScope::Top), theValue);
} else if (auto* get = global->init->dynCast<GlobalGet>()) {
Ref theVar = ValueBuilder::makeVar();
ast->push_back(theVar);
ValueBuilder::appendToVar(
theVar,
fromName(global->name, NameScope::Top),
ValueBuilder::makeName(fromName(get->name, NameScope::Top)));
} else if (auto* get = init->dynCast<GlobalGet>()) {
value = ValueBuilder::makeName(fromName(get->name, NameScope::Top));
} else if (init->is<RefNull>()) {
value = ValueBuilder::makeName("null");
Copy link
Copy Markdown
Member

@tlively tlively Jun 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not NULL_ here?

Copy link
Copy Markdown
Member Author

@kripken kripken Jun 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, I forgot, thanks 😄

} else {
assert(false && "Top init type not supported");
}

ValueBuilder::appendToVar(
theVar, fromName(global->name, NameScope::Top), value);
}

Ref Wasm2JSBuilder::processFunction(Module* m,
Expand Down Expand Up @@ -2415,8 +2416,15 @@ Ref Wasm2JSBuilder::processFunctionBody(Module* m,
WASM_UNREACHABLE("unimp");
}
Ref visitRefAs(RefAs* curr) {
unimplemented(curr);
WASM_UNREACHABLE("unimp");
// TODO: support others
assert(curr->op == RefAsNonNull);

// value || trap()
ABI::wasm2js::ensureHelpers(module, ABI::wasm2js::TRAP);
return ValueBuilder::makeBinary(
visit(curr->value, EXPRESSION_RESULT),
IString("||"),
ValueBuilder::makeCall(ABI::wasm2js::TRAP));
}

Ref visitContBind(ContBind* curr) {
Expand Down
20 changes: 19 additions & 1 deletion test/wasm2js/refs.2asm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

function wasm2js_trap() { throw new Error('abort'); }

function asmFunc(imports) {
var Math_imul = Math.imul;
var Math_fround = Math.fround;
Expand All @@ -10,6 +12,7 @@ function asmFunc(imports) {
var Math_ceil = Math.ceil;
var Math_trunc = Math.trunc;
var Math_sqrt = Math.sqrt;
var global = null;
function null_() {
return null;
}
Expand All @@ -28,11 +31,24 @@ function asmFunc(imports) {
return x == y | 0;
}

function ref_as(x) {
return x || wasm2js_trap();
}

function use_global(x) {
var temp = null;
temp = global;
global = x;
return temp;
}

return {
"null_": null_,
"is_null": is_null,
"ref_func": ref_func,
"ref_eq": ref_eq
"ref_eq": ref_eq,
"ref_as": ref_as,
"use_global": use_global
};
}

Expand All @@ -42,3 +58,5 @@ export var null_ = retasmFunc.null_;
export var is_null = retasmFunc.is_null;
export var ref_func = retasmFunc.ref_func;
export var ref_eq = retasmFunc.ref_eq;
export var ref_as = retasmFunc.ref_as;
export var use_global = retasmFunc.use_global;
20 changes: 19 additions & 1 deletion test/wasm2js/refs.2asm.js.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

function wasm2js_trap() { throw new Error('abort'); }

function asmFunc(imports) {
var Math_imul = Math.imul;
var Math_fround = Math.fround;
Expand All @@ -10,6 +12,7 @@ function asmFunc(imports) {
var Math_ceil = Math.ceil;
var Math_trunc = Math.trunc;
var Math_sqrt = Math.sqrt;
var global = null;
function null_() {
return null;
}
Expand All @@ -26,11 +29,24 @@ function asmFunc(imports) {
return $0 == $1 | 0;
}

function ref_as($0) {
return $0 || wasm2js_trap();
}

function use_global($0) {
var $1 = null;
$1 = global;
global = $0;
return $1;
}

return {
"null_": null_,
"is_null": is_null,
"ref_func": ref_func,
"ref_eq": ref_eq
"ref_eq": ref_eq,
"ref_as": ref_as,
"use_global": use_global
};
}

Expand All @@ -40,3 +56,5 @@ export var null_ = retasmFunc.null_;
export var is_null = retasmFunc.is_null;
export var ref_func = retasmFunc.ref_func;
export var ref_eq = retasmFunc.ref_eq;
export var ref_as = retasmFunc.ref_as;
export var use_global = retasmFunc.use_global;
19 changes: 19 additions & 0 deletions test/wasm2js/refs.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
(module
(global $global (mut anyref) (ref.null any))

(func $null (export "null") (result anyref)
(ref.null any)
)
Expand Down Expand Up @@ -30,4 +32,21 @@
(local.get $y)
)
)

(func $ref.as (export "ref.as") (param $x anyref) (result anyref)
(ref.as_non_null
(local.get $x)
)
)

(func $use-global (export "use-global") (param $x anyref) (result anyref)
(local $temp anyref)
(local.set $temp
(global.get $global)
)
(global.set $global
(local.get $x)
)
(local.get $temp)
)
)