console: fix timeEnd() not coercing the input

BridgeAR · targos · commit 2a0862cec969 · 2018-07-16T21:14:20.000+02:00
The input of console.timeEnd() was not coerced to a string. That way labels were not found and the entry was not removed anymore. PR-URL: #21779 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/console.js b/lib/console.js
@@ -231,20 +231,22 @@ Console.prototype.time = function time(label = 'default') {
 };
 
 Console.prototype.timeEnd = function timeEnd(label = 'default') {
+  // Coerces everything other than Symbol to a string
+  label = `${label}`;
   const hasWarned = timeLogImpl(this, 'timeEnd', label);
   if (!hasWarned) {
     this._times.delete(label);
   }
 };
 
 Console.prototype.timeLog = function timeLog(label, ...data) {
+  // Coerces everything other than Symbol to a string
+  label = `${label}`;
   timeLogImpl(this, 'timeLog', label, data);
 };
 
 // Returns true if label was not found
 function timeLogImpl(self, name, label = 'default', data) {
-  // Coerces everything other than Symbol to a string
-  label = `${label}`;
   const time = self._times.get(label);
   if (!time) {
     process.emitWarning(`No such label '${label}' for console.${name}()`);
diff --git a/test/parallel/test-console.js b/test/parallel/test-console.js
@@ -132,11 +132,14 @@ console.timeEnd('constructor');
 console.time('hasOwnProperty');
 console.timeEnd('hasOwnProperty');
 
-// verify that values are coerced to strings
+// Verify that values are coerced to strings.
 console.time([]);
 console.timeEnd([]);
 console.time({});
 console.timeEnd({});
+// Repeat the object call to verify that everything really worked.
+console.time({});
+console.timeEnd({});
 console.time(null);
 console.timeEnd(null);
 console.time(undefined);
@@ -212,6 +215,7 @@ assert.ok(/^hasOwnProperty: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 // verify that console.time() coerces label values to strings as expected
 assert.ok(/^: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^\[object Object\]: \d+\.\d{3}ms$/.test(strings.shift().trim()));
+assert.ok(/^\[object Object\]: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^null: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^default: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^default: \d+\.\d{3}ms$/.test(strings.shift().trim()));
