Change use of NO_DYNAMIC_EXECUTION in embind to DYNAMIC_EXECUTION.

Adds a validation step to the nodejs command when running the tests with
DYNAMIC_EXECUTION=0 to ensure the generated script has no eval.  This
required adding the ability to specify args to the nodejs command to
jsrun.py

Author: wffurr

src/embind/embind.js

@@ -50,10 +50,10 @@ var LibraryEmbind = {
     Module['flushPendingDeletes'] = flushPendingDeletes;
     Module['setDelayFunction'] = setDelayFunction;
 #if IN_TEST_HARNESS
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     // Without dynamic execution, dynamically created functions will have no
     // names. This lets the test suite know that.
-    Module['NO_DYNAMIC_EXECUTION'] = true;
+    Module['DYNAMIC_EXECUTION'] = false;
 #endif
 #if EMBIND_STD_STRING_IS_UTF8
     Module['EMBIND_STD_STRING_IS_UTF8'] = true;
@@ -194,7 +194,7 @@ var LibraryEmbind = {
   $createNamedFunction__deps: ['$makeLegalFunctionName'],
   $createNamedFunction: function(name, body) {
     name = makeLegalFunctionName(name);
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     return function() {
       "use strict";
       return body.apply(this, arguments);
@@ -847,9 +847,9 @@ var LibraryEmbind = {
     if (!(constructor instanceof Function)) {
         throw new TypeError('new_ called with constructor type ' + typeof(constructor) + " which is not a function");
     }
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     if (constructor === Function) {
-      throw new Error('new_ cannot create a new Function with NO_DYNAMIC_EXECUTION.');
+      throw new Error('new_ cannot create a new Function with DYNAMIC_EXECUTION == 0.');
     }
 #endif
 
@@ -913,7 +913,7 @@ var LibraryEmbind = {
 
     var returns = (argTypes[0].name !== "void");
 
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     var argsWired = new Array(argCount - 2);
     return function() {
       if (arguments.length !== argCount - 2) {
@@ -1042,7 +1042,7 @@ var LibraryEmbind = {
     signature = readLatin1String(signature);
 
     function makeDynCaller(dynCall) {
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
       return function() {
           var args = new Array(arguments.length + 1);
           args[0] = rawFunction;

src/embind/emval.js

@@ -151,7 +151,7 @@ var LibraryEmVal = {
         var obj = new constructor(arg0, arg1, arg2);
         return __emval_register(obj);
     } */
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     var argsList = new Array(argCount + 1);
     return function(constructor, argTypes, args) {
       argsList[0] = constructor;
@@ -202,7 +202,7 @@ var LibraryEmVal = {
     return newer(handle, argTypes, args);
   },
 
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
   $emval_get_global: function() {
     function testGlobal(obj) {
       obj['$$$embind_global$$$'] = obj;
@@ -354,7 +354,7 @@ var LibraryEmVal = {
     var types = __emval_lookupTypes(argCount, argTypes);
 
     var retType = types[0];
-#if NO_DYNAMIC_EXECUTION
+#if DYNAMIC_EXECUTION == 0
     var argN = new Array(argCount - 1);
     var invokerFunction = function(handle, name, destructors, args) {
       var offset = 0;

tests/embind/embind.test.js

@@ -162,7 +162,7 @@ module({
         });
 
         test("setting and getting property on unrelated class throws error", function() {
-            var className = cm['NO_DYNAMIC_EXECUTION'] ? '' : 'HasTwoBases';
+            var className = cm['DYNAMIC_EXECUTION'] === false ? '' : 'HasTwoBases';
             var a = new cm.HasTwoBases;
             var e = assert.throws(cm.BindingError, function() {
                 Object.getOwnPropertyDescriptor(cm.HeldBySmartPtr.prototype, 'i').set.call(a, 10);
@@ -1598,7 +1598,7 @@ module({
 
         test("smart pointer object has correct constructor name", function() {
             var e = new cm.HeldBySmartPtr(10, "foo");
-            var expectedName = cm['NO_DYNAMIC_EXECUTION'] ? "" : "HeldBySmartPtr";
+            var expectedName = cm['DYNAMIC_EXECUTION'] === false ? "": "HeldBySmartPtr";
             assert.equal(expectedName, e.constructor.name);
             e.delete();
         });
@@ -2342,7 +2342,7 @@ module({
     });
 
     BaseFixture.extend("function names", function() {
-        if (cm['NO_DYNAMIC_EXECUTION']) {
+        if (cm['DYNAMIC_EXECUTION'] === false) {
           assert.equal('', cm.ValHolder.name);
           assert.equal('', cm.ValHolder.prototype.setVal.name);
           assert.equal('', cm.ValHolder.makeConst.name);

tests/test_other.py

@@ -2399,6 +2399,10 @@ def test_embind(self):
       if fail:
         self.assertNotEqual(proc.returncode, 0)
       else:
+        if 'DYNAMIC_EXECUTION=0' in args:
+          output = run_js(self.in_dir('a.out.js'), stdout=PIPE, stderr=PIPE, assert_returncode=0, engine=NODE_JS,
+                          shell_args=['--disallow-code-generation-from-strings'])
+
         with open(self.in_dir('a.out.js'), 'ab') as f:
           for tf in testFiles:
             f.write(open(tf, 'rb').read())

tools/jsrun.py

@@ -27,7 +27,7 @@ def timeout_run(proc, timeout=None, note='unnamed process', full_output=False, n
   return '\n'.join(out) if full_output else out[0]
 
 
-def make_command(filename, engine=None, args=[]):
+def make_command(filename, engine=None, args=[], shell_args=[]):
   if type(engine) is not list:
     engine = [engine]
   # Emscripten supports multiple javascript runtimes.  The default is nodejs but
@@ -43,10 +43,12 @@ def make_command(filename, engine=None, args=[]):
   is_d8 = 'd8' in jsengine
   # Disable true async compilation (async apis will in fact be synchronous) for now
   # due to https://bugs.chromium.org/p/v8/issues/detail?id=6263
-  shell_option_flags = ['--no-wasm-async-compilation'] if is_d8 else []
+  shell_args.extend(['--no-wasm-async-compilation'] if is_d8 else [])
   # Separates engine flags from script flags
-  flag_separator = ['--'] if is_d8 or 'jsc' in jsengine else []
-  return engine + [filename] + shell_option_flags + flag_separator + args
+  if is_d8 or 'jsc' in jsengine:
+    return engine + [filename] + shell_args + ['--'] + args
+  else:
+    return engine + shell_args + [filename] + args
 
 
 def check_engine(engine):
@@ -87,7 +89,7 @@ def run_js_tool(filename, engine, jsargs=[], *args, **kw):
 
 
 # TODO(sbc): Move to into test directory
-def run_js(filename, engine=None, args=[], check_timeout=False, stdin=None, stdout=PIPE, stderr=None, cwd=None,
+def run_js(filename, engine=None, args=[], shell_args=[], check_timeout=False, stdin=None, stdout=PIPE, stderr=None, cwd=None,
            full_output=False, assert_returncode=0, error_limit=-1, skip_check=False):
   """Execute javascript code generated by tests, with possible timeout."""
   if not os.path.exists(filename):
@@ -112,7 +114,7 @@ def run_js(filename, engine=None, args=[], check_timeout=False, stdin=None, stdo
   #  commands += os.path.basename(curr) + ',' + json.dumps(args) + '\n'
   #  open(commands_file, 'w').write(commands)
 
-  command = make_command(filename, engine, args)
+  command = make_command(filename, engine, args, shell_args)
   try:
     proc = Popen(
         command,