messages.js: Get better function names in stack traces.

src/messages.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 812 matching lines @@
 
 function CallSiteGetFunction() {
   return this.fun;
 }
 
 function CallSiteGetFunctionName() {
   // See if the function knows its own name
   var name = this.fun.name;
   if (name) {
     return name;
-  } else {
-    return %FunctionGetInferredName(this.fun);
   }
-  // Maybe this is an evaluation?
-  var script = %FunctionGetScript(this.fun);
-  if (script && script.compilation_type == COMPILATION_TYPE_EVAL) {
-    return "eval";
-  }
-  return null;
+  return %FunctionGetInferredName(this.fun);

[Christian Plesner Hansen, 2012/05/24 02:15:18]

I wonder if the eval case should have been reached if FunctionGetInferredName
returned null? If so it might make sense to change the logic to that and keep
the code that's removed here.

[marja, 2012/05/24 08:38:16]

Done.

 }
 
 function CallSiteGetMethodName() {
   // See if we can find a unique property on the receiver that holds
   // this function.
   var ownName = this.fun.name;
   if (ownName && this.receiver &&
       (%_CallFunction(this.receiver,
                       ownName,
                       ObjectLookupGetter) === this.fun ||
@@ skipping 93 matching lines @@
       if (columnNumber) {
         fileLocation += ":" + columnNumber;
       }
     }
   }
 
   if (!fileLocation) {
     fileLocation = "unknown source";
   }
   var line = "";
-  var functionName = this.getFunction().name;
-  var addPrefix = true;
+  var functionName = this.getFunctionName();
+  var addSuffix = true;

[Christian Plesner Hansen, 2012/05/24 02:15:18]

I always get suffix and prefix mixed up. I do the same with left and right.
Thanks for fixing it.

   var isConstructor = this.isConstructor();
   var isMethodCall = !(this.isToplevel() || isConstructor);
   if (isMethodCall) {
+    var typeNamePrefix = this.getTypeName() + ".";
     var methodName = this.getMethodName();
-    line += this.getTypeName() + ".";
     if (functionName) {
+      if (typeNamePrefix[0] != '[' &&

[Christian Plesner Hansen, 2012/05/24 02:15:18]

Something to consider to make this case easier to detect could be to change
getTypeName to take an optional argument that, if truthy, tells getTypeName to
return null in the cases where it otherwise just converts the object to a
string? Just a thought, it may not be a good idea.

[marja, 2012/05/24 08:38:16]

Done.

+          functionName.indexOf(typeNamePrefix) != 0) {
+        line += typeNamePrefix;
+      }
       line += functionName;
-      if (methodName && (methodName != functionName)) {
+      if (methodName && functionName.indexOf("." + methodName) !=

[Christian Plesner Hansen, 2012/05/24 02:15:18]

Is this equivalent to (methodName != this.getFunction().name)? If so that might
be a simpler way to express it.

[marja, 2012/05/24 08:38:16]

Not equivalent; kept this, but fixed indexof -> lastIndexOf.

+          functionName.length - methodName.length - 1) {
         line += " [as " + methodName + "]";
       }
     } else {
-      line += methodName || "<anonymous>";
+      line += (typeNamePrefix + (methodName || "<anonymous>"));
     }
   } else if (isConstructor) {
     line += "new " + (functionName || "<anonymous>");
   } else if (functionName) {
     line += functionName;
   } else {
     line += fileLocation;
-    addPrefix = false;
+    addSuffix = false;
   }
-  if (addPrefix) {
+  if (addSuffix) {
     line += " (" + fileLocation + ")";
   }
   return line;
 }
 
 SetUpLockedPrototype(CallSite, $Array("receiver", "fun", "pos"), $Array(
   "getThis", CallSiteGetThis,
   "getTypeName", CallSiteGetTypeName,
   "isToplevel", CallSiteIsToplevel,
   "isEval", CallSiteIsEval,
@@ skipping 248 matching lines @@
     throw e;
   }
 }
 
 
 InstallFunctions($Error.prototype, DONT_ENUM, ['toString', ErrorToString]);
 
 // Boilerplate for exceptions for stack overflows. Used from
 // Isolate::StackOverflow().
 var kStackOverflowBoilerplate = MakeRangeError('stack_overflow', []);