Revert of Use displayName in Error.stack rendering if present.

src/js/messages.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // -------------------------------------------------------------------
 
 (function(global, utils) {
 
 %CheckIsBootstrapping();
 
@@ skipping 600 matching lines @@
 
 function CallSiteGetScriptNameOrSourceURL() {
   return %CallSiteGetScriptNameOrSourceUrlRT(this);
 }
 
 function CallSiteGetFunctionName() {
   // See if the function knows its own name
   return %CallSiteGetFunctionNameRT(this);
 }
 
-function CallSiteGetDebugName() {
-  // See if the function knows its own name
-  return %CallSiteGetDebugNameRT(this);
-}
-
 function CallSiteGetMethodName() {
   // See if we can find a unique property on the receiver that holds
   // this function.
   return %CallSiteGetMethodNameRT(this);
 }
 
 function CallSiteGetFileName() {
   return %CallSiteGetFileNameRT(this);
 }
 
@@ skipping 38 matching lines @@
       fileLocation += ":" + lineNumber;
       var columnNumber = this.getColumnNumber();
       if (columnNumber) {
         fileLocation += ":" + columnNumber;
       }
     }
   }
 
   var line = "";
   var functionName = this.getFunctionName();
-  var debugName = this.getDebugName();
+  var addSuffix = true;
   var isConstructor = this.isConstructor();
   var isMethodCall = !(this.isToplevel() || isConstructor);
-  if (debugName) {
-    if (isConstructor) line += "new ";
-    line += debugName;
-  } else if (isMethodCall) {
+  if (isMethodCall) {
     var typeName = GetTypeName(GET_PRIVATE(this, callSiteReceiverSymbol), true);
     var methodName = this.getMethodName();
     if (functionName) {
       if (typeName && %_Call(StringIndexOf, functionName, typeName) != 0) {
         line += typeName + ".";
       }
       line += functionName;
       if (methodName &&
           (%_Call(StringIndexOf, functionName, "." + methodName) !=
            functionName.length - methodName.length - 1)) {
         line += " [as " + methodName + "]";
       }
     } else {
       line += typeName + "." + (methodName || "<anonymous>");
     }
   } else if (isConstructor) {
     line += "new " + (functionName || "<anonymous>");
   } else if (functionName) {
     line += functionName;
   } else {
-    return line + fileLocation;
+    line += fileLocation;
+    addSuffix = false;
   }
-  return line + " (" + fileLocation + ")";
+  if (addSuffix) {
+    line += " (" + fileLocation + ")";
+  }
+  return line;
 }
 
 utils.SetUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [
   "getThis", CallSiteGetThis,
   "getTypeName", CallSiteGetTypeName,
   "isToplevel", CallSiteIsToplevel,
   "isEval", CallSiteIsEval,
   "getEvalOrigin", CallSiteGetEvalOrigin,
   "getScriptNameOrSourceURL", CallSiteGetScriptNameOrSourceURL,
   "getFunction", CallSiteGetFunction,
   "getFunctionName", CallSiteGetFunctionName,
-  "getDebugName", CallSiteGetDebugName,
   "getMethodName", CallSiteGetMethodName,
   "getFileName", CallSiteGetFileName,
   "getLineNumber", CallSiteGetLineNumber,
   "getColumnNumber", CallSiteGetColumnNumber,
   "isNative", CallSiteIsNative,
   "getPosition", CallSiteGetPosition,
   "isConstructor", CallSiteIsConstructor,
   "toString", CallSiteToString
 ]);
 
@@ skipping 274 matching lines @@
 utils.Export(function(to) {
   to.ErrorToString = ErrorToString;
   to.MakeError = MakeError;
   to.MakeRangeError = MakeRangeError;
   to.MakeSyntaxError = MakeSyntaxError;
   to.MakeTypeError = MakeTypeError;
   to.MakeURIError = MakeURIError;
 });
 
 });