Skip to content

Commit 37d4f19

Browse files
tzezulaansalond
authored andcommitted
[GR-68614] Backport to 25.0: Create polyglot-isolate library for wasm language.
PullRequest: graal/21807
2 parents 264ce3c + b1f6c21 commit 37d4f19

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

docs/reference-manual/embedding/embed-languages.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ Currently, the following languages are available as polyglot isolates:
763763
|-------------------------------|----------------|
764764
| JavaScript (`js-isolate`) | 23.1 |
765765
| Python (`python-isolate`) | 24.1 |
766+
| Wasm (`wasm-isolate`) | 25.0 |
766767
767768
We plan to add support for more languages in future versions.
768769
@@ -1702,4 +1703,4 @@ public final class CHANGE_NAME_EngineFactory implements ScriptEngineFactory {
17021703
}
17031704
}
17041705
</code></pre>
1705-
</details>
1706+
</details>

sdk/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This changelog summarizes major changes between GraalVM SDK versions. The main f
2020
* GR-64947 Added `Engine.storeCache(Path)` to manually store [auxiliary engine caches](https://github.com/oracle/graal/blob/master/truffle/docs/AuxiliaryEngineCachingEnterprise.md) when needed.
2121
* GR-66515 If neither a log handler nor the `log.file` option is set on the `Engine.Builder` or `Context.Builder`, Truffle and language log messages will be written to the Context’s error output stream by default. The `log.file` option is now also supported on `Context.Builder`.
2222
* GR-65561 Added `Context.Builder#apply`, `ContextBuilder#extendIO`, and `ContextBuilder#extendHostAccess` to enable composable Context configuration
23+
* GR-63009: The WebAssembly (Wasm) language is now available as a polyglot isolate.
2324

2425
## Version 24.2.0
2526
* GR-54905 When using Truffle NFI with the Panama backend, native access must now be granted to the Truffle module instead of the NFI Panama module. Use the `--enable-native-access=org.graalvm.truffle` Java command line option to enable the native access for the NFI Panama backend.

vm/ci/ci_common/common.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ local devkits = graal_common.devkits;
280280
# 2. Ensure the language is either:
281281
# - already included in `ee_suites`, or
282282
# - its suite is listed in `polyglot_isolate_ce_suites`.
283-
local polyglot_isolate_languages = ['js', 'python'],
284-
local polyglot_isolate_ce_suites = ['graal-js', 'graalpython'],
283+
local polyglot_isolate_languages = ['js', 'python', 'wasm'],
284+
local polyglot_isolate_ce_suites = ['graal-js', 'graalpython', 'wasm'],
285285
local polyglot_isolate_mx_args = std.flattenArrays([['--suite', s] for s in polyglot_isolate_ce_suites]),
286286

287287
legacy_mx_args:: [], # `['--force-bash-launcher=true', '--skip-libraries=true']` have been replaced by arguments from `vm.maven_deploy_base_functions.mx_args(os, arch)`

wasm/mx.wasm/mx_wasm.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ class GraalWasmDefaultTags:
116116
wasmbenchtest = "wasmbenchtest"
117117
coverage = "coverage"
118118

119+
def mx_register_dynamic_suite_constituents(register_project, register_distribution):
120+
if register_project and register_distribution:
121+
isolate_build_options = []
122+
meta_pom = [p for p in _suite.dists if p.name == 'WASM_POM'][0]
123+
mx_truffle.register_polyglot_isolate_distributions(_suite, register_project, register_distribution,'wasm',
124+
'src', meta_pom.name, meta_pom.maven_group_id(), meta_pom.theLicense,
125+
isolate_build_options=isolate_build_options)
126+
119127

120128
def wabt_test_args():
121129
if not wabt_dir:

0 commit comments

Comments
 (0)