util: fix TypeError of symbol in template literals

cola119 · targos · commit a1f581a61eae · 2022-07-12T07:41:30.000+02:00
PR-URL: #42790 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -581,7 +581,7 @@ function getConstructorName(obj, ctx, recurseTimes, protoProps){
 addPrototypeProperties(
 ctx, tmp, firstProto || tmp, recurseTimes, protoProps);
 }
- return descriptor.value.name;
+ return String(descriptor.value.name);
 }
 
 obj = ObjectGetPrototypeOf(obj);
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
@@ -1396,6 +1396,9 @@ if (typeof Symbol !== 'undefined'){
 class SetSubclass extends Set{}
 class MapSubclass extends Map{}
 class PromiseSubclass extends Promise{}
+ class SymbolNameClass{
+ static name = Symbol('name');
+ }
 
 const x = new ObjectSubclass();
 x.foo = 42;
@@ -1409,6 +1412,8 @@ if (typeof Symbol !== 'undefined'){
 "MapSubclass(1) [Map]{'foo' => 42 }");
 assert.strictEqual(util.inspect(new PromiseSubclass(() =>{})),
 'PromiseSubclass [Promise]{<pending> }');
+ assert.strictEqual(util.inspect(new SymbolNameClass()),
+ 'Symbol(name){}');
 assert.strictEqual(
 util.inspect({a:{b: new ArraySubclass([1, [2], 3]) } },{depth: 1 }),
 '{a:{b: [ArraySubclass] } }'

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ function getConstructorName(obj, ctx, recurseTimes, protoProps){`
`581`	`581`	`addPrototypeProperties(`
`582`	`582`	`ctx,tmp,firstProto\|\|tmp,recurseTimes,protoProps);`
`583`	`583`	`}`
`584`		`-returndescriptor.value.name;`
	`584`	`+returnString(descriptor.value.name);`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`obj=ObjectGetPrototypeOf(obj);`
-Original file line number
+Diff line change
 classSetSubclassextendsSet{}
 classMapSubclassextendsMap{}
 classPromiseSubclassextendsPromise{}
 +classSymbolNameClass{
 +staticname=Symbol('name');
 +}
 constx=newObjectSubclass();
 x.foo=42;
 "MapSubclass(1) [Map]{'foo' => 42 }");
 assert.strictEqual(util.inspect(newPromiseSubclass(()=>{})),
 'PromiseSubclass [Promise]{<pending>}');
 +assert.strictEqual(util.inspect(newSymbolNameClass()),
 +'Symbol(name){}');
 assert.strictEqual(
 util.inspect({a: {b: newArraySubclass([1,[2],3])}},{depth: 1}),
 '{a:{b: [ArraySubclass] } }'