Skip to content

Change use of NO_DYNAMIC_EXECUTION in embind to DYNAMIC_EXECUTION. #7653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2018
Merged

Change use of NO_DYNAMIC_EXECUTION in embind to DYNAMIC_EXECUTION. #7653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/embind/embind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ var LibraryEmbind = {
Module['flushPendingDeletes'] = flushPendingDeletes;
Module['setDelayFunction'] = setDelayFunction;
#if IN_TEST_HARNESS
#if NO_DYNAMIC_EXECUTION
#if DYNAMIC_EXECUTION
// 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'] = true;
#endif
#if EMBIND_STD_STRING_IS_UTF8
Module['EMBIND_STD_STRING_IS_UTF8'] = true;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/embind/emval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions tests/embind/embind.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] ? 'HasTwoBases' : '';
var a = new cm.HasTwoBases;
var e = assert.throws(cm.BindingError, function() {
Object.getOwnPropertyDescriptor(cm.HeldBySmartPtr.prototype, 'i').set.call(a, 10);
Expand Down Expand Up @@ -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'] ? "HeldBySmartPtr" : "";
assert.equal(expectedName, e.constructor.name);
e.delete();
});
Expand Down Expand Up @@ -2342,7 +2342,7 @@ module({
});

BaseFixture.extend("function names", function() {
if (cm['NO_DYNAMIC_EXECUTION']) {
if (!cm['DYNAMIC_EXECUTION']) {
assert.equal('', cm.ValHolder.name);
assert.equal('', cm.ValHolder.prototype.setVal.name);
assert.equal('', cm.ValHolder.makeConst.name);
Expand Down
6 changes: 6 additions & 0 deletions tests/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2399,6 +2399,12 @@ def test_embind(self):
if fail:
self.assertNotEqual(proc.returncode, 0)
else:
if 'DYNAMIC_EXECUTION=0' in args:
with open(self.in_dir('a.out.js'), 'r') as js_binary_file:
js_binary_str = js_binary_file.read()
self.assertNotIn('new Function(', js_binary_str, 'Found "new Function(" with DYNAMIC_EXECUTION=0')
self.assertNotIn('eval(', js_binary_str, 'Found "eval(" with DYNAMIC_EXECUTION=0')

with open(self.in_dir('a.out.js'), 'ab') as f:
for tf in testFiles:
f.write(open(tf, 'rb').read())
Expand Down