Skip to content

Commit

Permalink
lib/vm.js: removed redundant checking of bad importModuleDynamically
Browse files Browse the repository at this point in the history
ERR_VM_MODULE_NOT_MODULE error is already checked in linkingStatusMap.
Thrown in L186: lib/internal/vm/source_text_module.js
  • Loading branch information
alyssaq committed Nov 6, 2018
1 parent 5e6193f commit 0b5d900
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 0 additions & 2 deletions lib/internal/vm/source_text_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ class SourceTextModule {
if (isModuleNamespaceObject(m)) {
return m;
}
if (!m || !wrapMap.has(m))
throw new ERR_VM_MODULE_NOT_MODULE();
const childLinkingStatus = linkingStatusMap.get(m);
if (childLinkingStatus === 'errored')
throw m.error;
Expand Down
8 changes: 2 additions & 6 deletions lib/vm.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ const {
} = internalBinding('contextify');
const { callbackMap } = internalBinding('module_wrap');
const {
ERR_INVALID_ARG_TYPE,
ERR_VM_MODULE_NOT_MODULE,
ERR_INVALID_ARG_TYPE
} = require('internal/errors').codes;
const { isModuleNamespaceObject, isArrayBufferView } = require('util').types;
const { validateInt32, validateUint32 } = require('internal/validators');
Expand Down Expand Up @@ -97,15 +96,12 @@ class Script extends ContextifyScript {
'function',
importModuleDynamically);
}
const { wrapMap, linkingStatusMap } =
require('internal/vm/source_text_module');
const { linkingStatusMap } = require('internal/vm/source_text_module');
callbackMap.set(this, { importModuleDynamically: async (...args) => {
const m = await importModuleDynamically(...args);
if (isModuleNamespaceObject(m)) {
return m;
}
if (!m || !wrapMap.has(m))
throw new ERR_VM_MODULE_NOT_MODULE();
const childLinkingStatus = linkingStatusMap.get(m);
if (childLinkingStatus === 'errored')
throw m.error;
Expand Down

0 comments on commit 0b5d900

Please sign in to comment.