Skip to content

Commit a8c4ccf

Browse files
committed
Add --sun-misc-unsafe-memory-access=allow option into node launcher.
PullRequest: js/3355
2 parents 350d3e8 + 244e1cd commit a8c4ccf

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

graal-nodejs/deps/v8/src/graal/graal_isolate.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,9 @@ v8::Isolate* GraalIsolate::New(v8::Isolate::CreateParams const& params, v8::Isol
531531
options.push_back({const_cast<char*>("-Dsun.java.command=node"), nullptr});
532532

533533
options.push_back({const_cast<char*>("--enable-native-access=org.graalvm.truffle"), nullptr});
534+
#if JAVA_FEATURE_VERSION >= 23
535+
options.push_back({const_cast<char*>("--sun-misc-unsafe-memory-access=allow"), nullptr});
536+
#endif
534537

535538
#if defined(DEBUG)
536539
std::string debugPort = getstdenv("DEBUG_PORT");

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,14 @@ def processDevkitRoot(env=None):
425425
_setEnvVar('GYP_MSVS_VERSION', devkit_version, _env)
426426

427427
def _prepare_build_env(build_env=None):
428+
env = build_env or os.environ
429+
430+
# GR-59703: Migrate sun.misc.* usages.
431+
for flags_var in ('CXXFLAGS', 'CFLAGS'):
432+
other_flags = env.get(flags_var)
433+
_setEnvVar(flags_var, f"-DJAVA_FEATURE_VERSION={mx.get_jdk(tag='default').version.parts[0]}{' ' + other_flags if other_flags else ''}", env)
434+
428435
if _current_os == 'darwin' and _current_arch == 'amd64':
429-
env = build_env or os.environ
430436
min_version = env.get('MACOSX_DEPLOYMENT_TARGET')
431437
if min_version:
432438
# override MACOSX_DEPLOYMENT_TARGET in common.gypi

0 commit comments

Comments
 (0)