lib: further simplify assertions in vm/module

addaleax · BridgeAR · commit 614b2c58f0b3 · 2020-01-03T16:12:12.000+01:00
Refs: #30755 PR-URL: #30815 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { fail } = require('internal/assert');
+const assert = require('internal/assert');
 const {
 ArrayIsArray,
 ObjectCreate,
@@ -59,11 +59,6 @@ const kContext = Symbol('kContext');
 const kPerContextModuleId = Symbol('kPerContextModuleId');
 const kLink = Symbol('kLink');
 
-function failIfDebug() {
- if (process.features.debug === false) return;
- fail('VM Modules');
-}
-
 class Module {
 constructor(options) {
 emitExperimentalWarning('VM Modules');
@@ -119,12 +114,11 @@ class Module {
 importModuleDynamicallyWrap(options.importModuleDynamically) :
 undefined,
 });
- } else if (syntheticEvaluationSteps) {
+ } else {
+ assert(syntheticEvaluationSteps);
 this[kWrap] = new ModuleWrap(identifier, context,
 syntheticExportNames,
 syntheticEvaluationSteps);
- } else {
- failIfDebug();
 }
 
 wrapToModuleMap.set(this[kWrap], this);
@@ -380,7 +374,9 @@ class SyntheticModule extends Module {
 identifier,
 });
 
- this[kLink] = () => this[kWrap].link(() => { failIfDebug(); });
+ this[kLink] = () => this[kWrap].link(() => {
+ assert.fail('link callback should not be called');
+ });
 }
 
 setExport(name, value) {

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 'use strict';
 -const{ fail }=require('internal/assert');
 +constassert=require('internal/assert');
 const{
  ArrayIsArray,
  ObjectCreate,
 constkPerContextModuleId=Symbol('kPerContextModuleId');
 constkLink=Symbol('kLink');
 -functionfailIfDebug(){
 -if(process.features.debug===false)return;
 -fail('VM Modules');
 -}
+-
 classModule{
 constructor(options){
 emitExperimentalWarning('VM Modules');
 importModuleDynamicallyWrap(options.importModuleDynamically) :
 undefined,
 });
 -}elseif(syntheticEvaluationSteps){
 +}else{
 +assert(syntheticEvaluationSteps);
 this[kWrap]=newModuleWrap(identifier,context,
 syntheticExportNames,
 syntheticEvaluationSteps);
 -}else{
 -failIfDebug();
+}
 wrapToModuleMap.set(this[kWrap],this);
  identifier,
 });
 -this[kLink]=()=>this[kWrap].link(()=>{failIfDebug();});
 +this[kLink]=()=>this[kWrap].link(()=>{
 +assert.fail('link callback should not be called');
 +});
+}
 setExport(name,value){