lib/vm.js: removed redundant checking of bad importModuleDynamically

alyssaq · alyssaq · commit 0b5d900788ff · 2018-11-06T18:42:59.000Z
ERR_VM_MODULE_NOT_MODULE error is already checked in linkingStatusMap.
Thrown in L186: lib/internal/vm/source_text_module.js
diff --git a/lib/internal/vm/source_text_module.js b/lib/internal/vm/source_text_module.js
@@ -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;
diff --git a/lib/vm.js b/lib/vm.js
@@ -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');
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,6 @@ class SourceTextModule {`
`121`	`121`	`if (isModuleNamespaceObject(m)) {`
`122`	`122`	`return m;`
`123`	`123`	`}`
`124`		`- if (!m \|\| !wrapMap.has(m))`
`125`		`- throw new ERR_VM_MODULE_NOT_MODULE();`
`126`	`124`	`const childLinkingStatus = linkingStatusMap.get(m);`
`127`	`125`	`if (childLinkingStatus === 'errored')`
`128`	`126`	`throw m.error;`