[GR-18877] Update overlay to fix benchmarks

PullRequest: graalpython/691

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ overlay: "bb8c47317088fde566681fdc692580d3439600c7" }
+{ overlay: "2d87253efc83ec7b5cf875dd2ae52fac4a96db5e" }

mx.graalpython/mx_graalpython_benchmark.py

@@ -259,7 +259,14 @@ def hosting_registry(self):
 
     def run(self, cwd, args):
         _check_vm_args(self.name(), args)
+        extra_polyglot_args = ["--experimental-options"]
 
+        host_vm = self.host_vm()
+        if hasattr(host_vm, 'run_lang'): # this is a full GraalVM build
+            with environ(self._env or {}):
+                return host_vm.run_lang('graalpython', extra_polyglot_args + args, cwd)
+
+        # Otherwise, we're running from the source tree
         truffle_options = [
             # '-Dgraal.TruffleCompilationExceptionsAreFatal=true'
         ]
@@ -278,7 +285,7 @@ def run(self, cwd, args):
             if mx.suite("sulong-managed", fatalIfMissing=False):
                 dists.append('SULONG_MANAGED')
 
-        extra_polyglot_args += ["--experimental-options", "--python.CAPI=%s" % SUITE.extensions._get_capi_home() ]
+        extra_polyglot_args += ["--python.CAPI=%s" % SUITE.extensions._get_capi_home()]
 
         vm_args = mx.get_runtime_jvm_args(dists, cp_suffix=self._cp_suffix, cp_prefix=self._cp_prefix)
         if isinstance(self._extra_vm_args, list):
@@ -293,14 +300,10 @@ def run(self, cwd, args):
                 args.remove(a)
         cmd = truffle_options + vm_args + extra_polyglot_args + args
 
-        host_vm = self.host_vm()
         if not self._env:
             self._env = dict()
         with environ(self._env):
-            if hasattr(host_vm, 'run_lang'):
-                return host_vm.run_lang('graalpython', extra_polyglot_args + args, cwd)
-            else:
-                return host_vm.run(cwd, cmd)
+            return host_vm.run(cwd, cmd)
 
     def name(self):
         return VM_NAME_GRAALPYTHON