Skip to content

Commit a53ddb8

Browse files
inexorabletashzolkis
inexorabletash
authored and
zolkis
committed
Ensure object creation specifies the realm (webmachinelearning#810)
* Ensure object creation specifies the realm "Realm" is an ECMAScript concept best explained in https://html.spec.whatwg.org/multipage/webappapis.html#realms-and-their-counterparts Newly created JS objects must be associated with a Realm; while older specs didn't do this explicitly, best practice is to be explicit about this, especially for steps running "in parallel", or in algorithms separate from method steps. Do so! This also adds lint tests to try and catch future violations. Note that dictionaries (e.g. MLOperatorDescriptor) are Infra "ordered maps" it the body of spec algorithms, not JS objects, so they don't have a realm. Conversion to a JS object when returning a dictionary to script is handled by WebIDL bindings logic. Also note that DOMExceptions, either thrown or as promise rejection values, are not given a realm. This is a known issue across all web specs and is tracked in whatwg/webidl#135. Resolves webmachinelearning#793. * Don't double-init realm; and don't need realm for dicts * Variable name improvement from @fdwr
1 parent c987311 commit a53ddb8

File tree

2 files changed

+53
-31
lines changed

2 files changed

+53
-31
lines changed

‎index.bs‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -810,13 +810,13 @@ The <dfn dfn-for=MLContextOptions dfn-type=dict-member>powerPreference</dfn> opt
810810
<summary>
811811
To <dfn>create a context</dfn> given [=realm=] |realm| and |options| (a {{GPUDevice}} or {{MLContextOptions}}), run these steps:
812812
</summary>
813-
1. Let |context| be a new {{MLContext}} object with |realm|.
813+
1. Let |context| be a new {{MLContext}} in |realm|.
814814
1. If |options| is a {{GPUDevice}} object:
815815
1. Set |context|.{{MLContext/[[contextType]]}} to "[=context type/webgpu=]".
816816
1. Set |context|.{{MLContext/[[powerPreference]]}} to {{MLPowerPreference/"default"}}.
817817
1. Otherwise:
818818
1. Set |context|.{{MLContext/[[contextType]]}} to "[=context type/default=]".
819-
1. Set |context|.{{MLContext/[[lost]]}} to [=a new promise=].
819+
1. Set |context|.{{MLContext/[[lost]]}} to [=a new promise=] in |realm|.
820820
1. If |options|["{{MLContextOptions/powerPreference}}"] [=map/exists=], then set |context|.{{MLContext/[[powerPreference]]}} to |options|["{{MLContextOptions/powerPreference}}"].
821821
1. Otherwise, set |context|.{{MLContext/[[powerPreference]]}} to {{MLPowerPreference/"default"}}.
822822
1. If the user agent cannot support |context|.{{MLContext/[[contextType]]}} and |context|.{{MLContext/[[powerPreference]]}}, return failure.
@@ -828,9 +828,9 @@ The <dfn dfn-for=MLContextOptions dfn-type=dict-member>powerPreference</dfn> opt
828828
The <dfn method for=ML>createContext(|options|)</dfn> steps are:
829829
</summary>
830830
1. Let |global| be [=this=]'s [=relevant global object=].
831-
1. If |global|'s [=associated Document=] is not [=allowed to use=] the [=webnn-feature|webnn=] feature, return [=a new promise=] [=rejected=] with a "{{SecurityError}}" {{DOMException}}.
832831
1. Let |realm| be [=this=]'s [=relevant realm=].
833-
1. Let |promise| be [=a new promise=].
832+
1. If |global|'s [=associated Document=] is not [=allowed to use=] the [=webnn-feature|webnn=] feature, return [=a new promise=] in |realm| [=rejected=] with a "{{SecurityError}}" {{DOMException}}.
833+
1. Let |promise| be [=a new promise=] in |realm|.
834834
1. Run the following steps [=in parallel=].
835835
1. Let |context| be the result of [=creating a context=] given |realm| and |options|. If that returns failure, then [=queue an ML task=] with |global| to [=reject=] |promise| with a "{{NotSupportedError}}" {{DOMException}} and abort these steps.
836836
1. [=Queue an ML task=] with |global| to [=resolve=] |promise| with |context|.
@@ -842,9 +842,9 @@ The <dfn dfn-for=MLContextOptions dfn-type=dict-member>powerPreference</dfn> opt
842842
The <dfn method for=ML>createContext(|gpuDevice|)</dfn> method steps are:
843843
</summary>
844844
1. Let |global| be [=this=]'s [=relevant global object=].
845-
1. If |global|'s [=associated Document=] is not [=allowed to use=] the [=webnn-feature|webnn=] feature, return [=a new promise=] [=rejected=] with a "{{SecurityError}}" {{DOMException}}.
846845
1. Let |realm| be [=this=]'s [=relevant realm=].
847-
1. Let |promise| be [=a new promise=].
846+
1. If |global|'s [=associated Document=] is not [=allowed to use=] the [=webnn-feature|webnn=] feature, return [=a new promise=] in |realm| [=rejected=] with a "{{SecurityError}}" {{DOMException}}.
847+
1. Let |promise| be [=a new promise=] in |realm|.
848848
1. Run the following steps [=in parallel=].
849849
1. Let |context| be the result of [=creating a context=] given |realm| and |gpuDevice|. If that returns failure, then [=queue an ML task=] with |global| to [=reject=] |promise| with a "{{NotSupportedError}}" {{DOMException}} and abort these steps.
850850
1. [=Queue an ML task=] with |global| to [=resolve=] |promise| with |context|.
@@ -1043,9 +1043,10 @@ Creates an {{MLTensor}} associated with this {{MLContext}}.
10431043
The <dfn method for=MLContext>createTensor(|descriptor|)</dfn> method steps are:
10441044
</summary>
10451045
1. Let |global| be [=this=]'s [=relevant global object=].
1046-
1. If [=this=] [=MLContext/is lost=], then return [=a new promise=] [=rejected=] with an "{{InvalidStateError}}" {{DOMException}}.
1046+
1. Let |realm| be [=this=]'s [=relevant realm=].
1047+
1. If [=this=] [=MLContext/is lost=], then return [=a new promise=] in |realm| [=rejected=] with an "{{InvalidStateError}}" {{DOMException}}.
10471048
1. Let |tensor| be the result of [=creating an MLTensor=] given [=this=], and |descriptor|.
1048-
1. Let |promise| be [=a new promise=].
1049+
1. Let |promise| be [=a new promise=] in |realm|.
10491050
1. Enqueue the following steps to [=this=].{{MLContext/[[timeline]]}}:
10501051
1. Run these steps, but [=/abort when=] [=this=] [=MLContext/is lost=]:
10511052
1. Create |tensor|.{{MLTensor/[[data]]}} given |descriptor| and initialize all bytes to zeros.
@@ -1072,10 +1073,10 @@ Reads back the {{MLTensor/[[data]]}} of an {{MLTensor}} from the {{MLContext}}.{
10721073
</summary>
10731074
1. Let |global| be [=this=]'s [=relevant global object=].
10741075
1. Let |realm| be [=this=]'s [=relevant realm=].
1075-
1. If |tensor|.{{MLTensor/[[context]]}} is not [=this=], then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1076-
1. If |tensor|.{{MLTensor/[[isDestroyed]]}} is true, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1077-
1. If |tensor|.{{MLTensor/[[descriptor]]}}.{{MLTensorDescriptor/readable}} is false, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1078-
1. Let |promise| be [=a new promise=].
1076+
1. If |tensor|.{{MLTensor/[[context]]}} is not [=this=], then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1077+
1. If |tensor|.{{MLTensor/[[isDestroyed]]}} is true, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1078+
1. If |tensor|.{{MLTensor/[[descriptor]]}}.{{MLTensorDescriptor/readable}} is false, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1079+
1. Let |promise| be [=a new promise=] in |realm|.
10791080
1. Enqueue the following steps to |tensor|.{{MLTensor/[[context]]}}.{{MLContext/[[timeline]]}}:
10801081
1. Run these steps, but [=/abort when=] [=this=] [=MLContext/is lost=]:
10811082
1. Let |bytes| be a [=/byte sequence=] containing a copy of |tensor|.{{MLTensor/[[data]]}}.
@@ -1102,11 +1103,12 @@ Bring-your-own-buffer variant of {{MLContext/readTensor(tensor)}}. Reads back th
11021103
The <dfn method for=MLContext>readTensor(|tensor|, |outputData|)</dfn> method steps are:
11031104
</summary>
11041105
1. Let |global| be [=this=]'s [=relevant global object=].
1105-
1. If |tensor|.{{MLTensor/[[context]]}} is not [=this=], then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1106-
1. If |tensor|.{{MLTensor/[[isDestroyed]]}} is true, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1107-
1. If |tensor|.{{MLTensor/[[descriptor]]}}.{{MLTensorDescriptor/readable}} is false, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1108-
1. If [=validating buffer with descriptor=] given |outputData| and |tensor|.{{MLTensor/[[descriptor]]}} returns false, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1109-
1. Let |promise| be [=a new promise=].
1106+
1. Let |realm| be [=this=]'s [=relevant realm=].
1107+
1. If |tensor|.{{MLTensor/[[context]]}} is not [=this=], then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1108+
1. If |tensor|.{{MLTensor/[[isDestroyed]]}} is true, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1109+
1. If |tensor|.{{MLTensor/[[descriptor]]}}.{{MLTensorDescriptor/readable}} is false, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1110+
1. If [=validating buffer with descriptor=] given |outputData| and |tensor|.{{MLTensor/[[descriptor]]}} returns false, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1111+
1. Let |promise| be [=a new promise=] in |realm|.
11101112
1. Enqueue the following steps to |tensor|.{{MLTensor/[[context]]}}.{{MLContext/[[timeline]]}}:
11111113
1. Run these steps, but [=/abort when=] [=this=] [=MLContext/is lost=]:
11121114
1. Let |bytes| be a [=/byte sequence=] containing a copy of |tensor|.{{MLTensor/[[data]]}}.
@@ -1473,7 +1475,8 @@ The {{MLOperand}} objects are created by the methods of {{MLGraphBuilder}}, inte
14731475
<summary>
14741476
To <dfn>create an MLOperand</dfn> given {{MLGraphBuilder}} |builder| and {{MLOperandDescriptor}} |desc|, run the following steps:
14751477
</summary>
1476-
1. Let |operand| be a new {{MLOperand}}.
1478+
1. Let |realm| be |builder|'s [=relevant realm=].
1479+
1. Let |operand| be a new {{MLOperand}} in |realm|.
14771480
1. Set |operand|.{{MLOperand/[[builder]]}} to |builder|.
14781481
1. Set |operand|.{{MLOperand/[[descriptor]]}} to |desc|.
14791482
1. Return |operand|.
@@ -1483,8 +1486,10 @@ The {{MLOperand}} objects are created by the methods of {{MLGraphBuilder}}, inte
14831486
<summary>
14841487
To <dfn>copy an MLOperand</dfn> given {{MLOperand}} |operand|, run the following steps:
14851488
</summary>
1486-
1. Let |result| be a new {{MLOperand}}.
1487-
1. Set |result|.{{MLOperand/[[builder]]}} to |operand|.{{MLOperand/[[builder]]}}.
1489+
1. Let |builder| be |operand|.{{MLOperand/[[builder]]}}.
1490+
1. Let |realm| be |builder|'s [=relevant realm=].
1491+
1. Let |result| be a new {{MLOperand}} in |realm|.
1492+
1. Set |result|.{{MLOperand/[[builder]]}} to |builder|.
14881493
1. Set |result|.{{MLOperand/[[descriptor]]}} to |operand|.{{MLOperand/[[descriptor]]}}.
14891494
1. If |operand|.{{MLOperand/[[name]]}} [=map/exists=], then set |result|.{{MLOperand/[[name]]}} to |operand|.{{MLOperand/[[name]]}}.
14901495
1. Return |result|.
@@ -1582,7 +1587,8 @@ An {{MLTensor}} is created by its associated {{MLContext}}.
15821587
<summary>
15831588
To <dfn>create an MLTensor</dfn> given {{MLContext}} |context| and {{MLTensorDescriptor}} |descriptor|, run the following steps:
15841589
</summary>
1585-
1. Let |tensor| be a new {{MLTensor}}.
1590+
1. Let |realm| be |context|'s [=relevant realm=].
1591+
1. Let |tensor| be a new {{MLTensor}} in |realm|.
15861592
1. Set |tensor|.{{MLTensor/[[context]]}} to |context|.
15871593
1. Set |tensor|.{{MLTensor/[[descriptor]]}} to |descriptor|.
15881594
1. Set |tensor|.{{MLTensor/[[isDestroyed]]}} to false.
@@ -1771,12 +1777,13 @@ Build a composed graph up to a given output operand into a computational graph a
17711777
<summary>
17721778
The <dfn method for=MLGraphBuilder>build(|outputs|)</dfn> method steps are:
17731779
</summary>
1774-
1. If [=this=] [=MLGraphBuilder/can not build=], then return [=a new promise=] [=rejected=] with an "{{InvalidStateError}}" {{DOMException}}.
1775-
1. If |outputs| is empty, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1780+
1. Let |realm| be [=this=]'s [=relevant realm=].
1781+
1. If [=this=] [=MLGraphBuilder/can not build=], then return [=a new promise=] in |realm| [=rejected=] with an "{{InvalidStateError}}" {{DOMException}}.
1782+
1. If |outputs| is empty, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
17761783
1. [=map/For each=] |name| → |operand| of |outputs|:
1777-
1. If |name| is empty, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1778-
1. If [=MLGraphBuilder/validating operand=] given [=this=] and |operand| returns false, then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1779-
1. If |operand| is in [=this=]'s [=MLGraphBuilder/graph=]'s [=computational graph/inputs=] or [=computational graph/constants=], then return [=a new promise=] [=rejected=] with a {{TypeError}}.
1784+
1. If |name| is empty, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1785+
1. If [=MLGraphBuilder/validating operand=] given [=this=] and |operand| returns false, then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
1786+
1. If |operand| is in [=this=]'s [=MLGraphBuilder/graph=]'s [=computational graph/inputs=] or [=computational graph/constants=], then return [=a new promise=] in |realm| [=rejected=] with a {{TypeError}}.
17801787
1. Let |operands| be a new empty [=/set=].
17811788
1. Let |operators| be a new empty [=/set=].
17821789
1. Let |inputs| be a new empty [=/set=].
@@ -1789,16 +1796,15 @@ Build a composed graph up to a given output operand into a computational graph a
17891796
1. [=list/For each=] |input| of |operand|.{{MLOperand/[[operator]]}}'s [=operator/inputs=]:
17901797
1. [=queue/Enqueue=] |input| to |queue|.
17911798
1. Let |global| be [=this=]'s [=relevant global object=].
1792-
1. Let |realm| be [=this=]'s [=relevant realm=].
1793-
1. Let |graph| be a new {{MLGraph}} with |realm|.
1799+
1. Let |graph| be a new {{MLGraph}} in |realm|.
17941800
1. Set |graph|.{{MLGraph/[[context]]}} to [=this=].{{MLGraphBuilder/[[context]]}}.
17951801
1. Set |graph|.{{MLGraph/[[isDestroyed]]}} to false.
17961802
1. [=set/For each=] |operand| in |inputs|:
17971803
1. Set |graph|.{{MLGraph/[[inputDescriptors]]}}[|operand|.{{MLOperand/[[name]]}}] to |operand|.{{MLOperand/[[descriptor]]}}.
17981804
1. [=map/For each=] |name| → |operand| of |outputs|:
17991805
1. Set |graph|.{{MLGraph/[[outputDescriptors]]}}[|name|] to |operand|.{{MLOperand/[[descriptor]]}}.
18001806
1. Set [=this=].{{MLGraphBuilder/[[hasBuilt]]}} to true.
1801-
1. Let |promise| be [=a new promise=].
1807+
1. Let |promise| be [=a new promise=] in |realm|.
18021808
1. Run the following steps [=in parallel=]:
18031809
1. Run these steps, but [=/abort when=] |graph|.{{MLGraph/[[context]]}} [=MLContext/is lost=]:
18041810
1. Let |graphImpl| be the result of converting [=this=]'s [=MLGraphBuilder/graph=] with |operands|, |operators|, |inputs|, and |outputs|'s [=map/values=] into an [=implementation-defined=] format which can be interpreted by the underlying platform.

‎tools/lint.mjs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ const root = parse(file, {
8383
});
8484

8585
log('simplifying DOM...');
86-
// Remove script and style elements from consideration
87-
for (const element of root.querySelectorAll('script, style')) {
86+
// Remove script and style elements from consideration. Remove generated indexes
87+
// too, since they can lead to duplicate false-positive matches for lint rules.
88+
for (const element of root.querySelectorAll('script, style, .index')) {
8889
element.remove();
8990
}
9091

@@ -350,4 +351,19 @@ for (const match of source.matchAll(/\|(\w+)\|\.{{(\w+)\/.*?}}/g)) {
350351
});
351352
}
352353

354+
// TODO: Generate this from the IDL itself.
355+
const dictionaryTypes = ['MLOperandDescriptor', 'MLContextLostInfo'];
356+
357+
// Ensure JS objects are created with explicit realm
358+
for (const match of text.matchAll(/ a new promise\b(?! in realm)/g)) {
359+
error(`Promise creation must specify realm: ${format(match)}`);
360+
}
361+
for (const match of text.matchAll(/ be a new ([A-Z]\w+)\b(?! in realm)/g)) {
362+
const type = match[1];
363+
// Dictionaries are just maps, so they don't need a realm.
364+
if (dictionaryTypes.includes(type))
365+
continue;
366+
error(`Object creation must specify realm: ${format(match)}`);
367+
}
368+
353369
globalThis.process.exit(exitCode);

0 commit comments

Comments
 (0)