Skip to content

Invert reference type null checks #1719

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
merged 6 commits into from
Mar 7, 2021
Merged

Invert reference type null checks #1719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15d7745
Invert reference type null checks
surma Mar 7, 2021
8ec6c96
Fix fixture
surma Mar 7, 2021
528fc7d
Use Eqz instead
surma Mar 7, 2021
be87ecd
Update src/compiler.ts
surma Mar 7, 2021
186a78f
Update src/compiler.ts
surma Mar 7, 2021
8384aa3
Update comment
surma Mar 7, 2021
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
7 changes: 6 additions & 1 deletion src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9941,7 +9941,12 @@ export class Compiler extends DiagnosticEmitter {
case TypeKind.EQREF:
case TypeKind.DATAREF:
case TypeKind.I31REF: {
return module.ref_is(RefIsOp.RefIsNull, expr);
// Needs to be true when the ref is _not_ null.
// Therefore: 1 - <ref.is_null>
return type.size == 64
? module.binary(BinaryOp.SubI64, module.i64(1), module.ref_is(RefIsOp.RefIsNull, expr))
: module.binary(BinaryOp.SubI32, module.i32(1), module.ref_is(RefIsOp.RefIsNull, expr));

}
default: {
assert(false);
Expand Down
6 changes: 6 additions & 0 deletions tests/compiler/features/reference-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ exports.preInstantiate = function(imports, exports) {
external: function(a) {
return a;
},
somethingReal() {
return {};
},
somethingNull() {
return null;
},
someObject: {
theKey: "Hello world!"
},
Expand Down
40 changes: 40 additions & 0 deletions tests/compiler/features/reference-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// can use externref as a parameter or return type

export declare function external(a: externref): externref;
export declare function somethingReal(): externref;
export declare function somethingNull(): externref;

export function internal(a: externref): externref {
const b = external(a);
Expand All @@ -26,6 +28,44 @@ console.log(someObject);
console.log(someKey);
console.log(Reflect.get(someObject, someKey));

// Truthiness conversion
if(!somethingReal()) {
assert(false);
}
if(!somethingNull()) {
// nop
} else {
assert(false);
}
if(somethingReal()) {
// nop
} else {
assert(false);
}
if(somethingNull()) {
assert(false);
}

// Explicit null checks (don’t work yet)
/*
if(somethingReal() !== null) {
// nop
} else {
assert(false);
}
if(somethingReal() === null) {
assert(false);
}
if(somethingNull() === null) {
// nop
} else {
assert(false);
}
if(somethingNull() !== null) {
assert(false);
}
*/

// can represent and recognize 'null'

var funcGlobal: funcref;
Expand Down
94 changes: 58 additions & 36 deletions tests/compiler/features/reference-types.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
(module
(type $none_=>_none (func))
(type $none_=>_externref (func (result externref)))
(type $externref_=>_externref (func (param externref) (result externref)))
(type $externref_=>_none (func (param externref)))
(type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
Expand All @@ -11,6 +12,8 @@
(import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
(import "console" "log" (func $~lib/bindings/console/log (param externref)))
(import "Reflect" "get" (func $~lib/bindings/Reflect/get (param externref externref) (result externref)))
(import "reference-types" "somethingReal" (func $features/reference-types/somethingReal (result externref)))
(import "reference-types" "somethingNull" (func $features/reference-types/somethingNull (result externref)))
(import "reference-types" "external" (func $features/reference-types/external (param externref) (result externref)))
(memory $0 1)
(data (i32.const 12) "L\00\00\00\00\00\00\00\00\00\00\00\01\00\00\006\00\00\00f\00e\00a\00t\00u\00r\00e\00s\00/\00r\00e\00f\00e\00r\00e\00n\00c\00e\00-\00t\00y\00p\00e\00s\00.\00t\00s\00\00\00\00\00\00\00")
Expand All @@ -26,6 +29,8 @@
(global $~lib/memory/__stack_pointer (mut i32) (i32.const 16476))
(global $~lib/memory/__heap_base i32 (i32.const 16476))
(export "external" (func $features/reference-types/external))
(export "somethingReal" (func $features/reference-types/somethingReal))
(export "somethingNull" (func $features/reference-types/somethingNull))
(export "internal" (func $features/reference-types/internal))
(export "memory" (memory $0))
(start $~start)
Expand Down Expand Up @@ -165,7 +170,6 @@
nop
)
(func $start:features/reference-types
(local $0 funcref)
global.get $features/reference-types/someObject
global.get $features/reference-types/someKey
call $~lib/bindings/Reflect/has
Expand All @@ -175,7 +179,7 @@
if
i32.const 0
i32.const 32
i32.const 19
i32.const 21
i32.const 1
call $~lib/builtins/abort
unreachable
Expand All @@ -188,57 +192,75 @@
global.get $features/reference-types/someKey
call $~lib/bindings/Reflect/get
call $~lib/bindings/console/log
global.get $features/reference-types/funcGlobal
i32.const 1
call $features/reference-types/somethingReal
ref.is_null
i32.eqz
i32.sub
i32.eqz
if
i32.const 0
i32.const 32
i32.const 32
i32.const 1
call $~lib/builtins/abort
unreachable
i32.eqz
if
i32.const 0
i32.const 32
i32.const 33
i32.const 3
call $~lib/builtins/abort
unreachable
end
end
ref.null func
global.set $features/reference-types/funcGlobal
global.get $features/reference-types/funcGlobal
i32.const 1
call $features/reference-types/somethingNull
ref.is_null
i32.eqz
i32.sub
i32.eqz
if
nop
else
i32.const 0
i32.const 32
i32.const 34
i32.const 1
call $~lib/builtins/abort
unreachable
i32.eqz
if
i32.const 0
i32.const 32
i32.const 38
i32.const 3
call $~lib/builtins/abort
unreachable
end
end
ref.null func
global.set $features/reference-types/funcGlobalInit
global.get $features/reference-types/funcGlobalInit
i32.const 1
call $features/reference-types/somethingReal
ref.is_null
i32.eqz
i32.eqz
i32.sub
if
nop
else
i32.const 0
i32.const 32
i32.const 36
i32.const 1
call $~lib/builtins/abort
unreachable
i32.eqz
if
i32.const 0
i32.const 32
i32.const 43
i32.const 3
call $~lib/builtins/abort
unreachable
end
end
global.get $features/reference-types/externGlobal
i32.const 1
call $features/reference-types/somethingNull
ref.is_null
i32.eqz
i32.eqz
i32.sub
if
i32.const 0
i32.const 32
i32.const 39
i32.const 1
call $~lib/builtins/abort
unreachable
i32.eqz
if
i32.const 0
i32.const 32
i32.const 46
i32.const 3
call $~lib/builtins/abort
unreachable
end
end
ref.null extern
global.set $features/reference-types/externGlobal
Expand Down