Print correct line number for Error thrown inside eval.

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 907 matching lines @@
 
 function CallSiteToString() {
   var fileName;
   var fileLocation = "";
   if (this.isNative()) {
     fileLocation = "native";
   } else if (this.isEval()) {
     fileName = this.getScriptNameOrSourceURL();
     if (!fileName) {
       fileLocation = this.getEvalOrigin();
+      fileLocation += ", ";  // Expecting source position to follow.
     }
   } else {
     fileName = this.getFileName();
   }
 
-  if (fileName) {
-    fileLocation += fileName;
+  if (!this.isNative()) {

[rossberg, 2012/06/18 13:11:30]

I think the code is clearer if you merge this conditional with the one above.

[Yang, 2012/06/18 13:18:42]

Done.

+    if (fileName) {
+      fileLocation += fileName;
+    } else {
+      // Source code does not originate from a file and is not native, but we
+      // can still get the source position inside the source string, e.g. in
+      // an eval string.
+      fileLocation += "<anonymous>";
+    }
     var lineNumber = this.getLineNumber();
     if (lineNumber != null) {
       fileLocation += ":" + lineNumber;
       var columnNumber = this.getColumnNumber();
       if (columnNumber) {
         fileLocation += ":" + columnNumber;
       }
     }
   }
 
-  if (!fileLocation) {
-    fileLocation = "unknown source";
-  }
   var line = "";
   var functionName = this.getFunctionName();
   var addSuffix = true;
   var isConstructor = this.isConstructor();
   var isMethodCall = !(this.isToplevel() || isConstructor);
   if (isMethodCall) {
     var typeName = GetTypeName(this, true);
     var methodName = this.getMethodName();
     if (functionName) {
       if (typeName && functionName.indexOf(typeName) != 0) {
@@ skipping 290 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', []);