Revert of Make Error.prototype.toString spec compliant; and fix various side-effect-free error printing metho…

test/cctest/test-api.cc

 // 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 5594 matching lines @@
       "ReferenceError.prototype.constructor.name = 1;"
       "Number.prototype.toString = function() { return 'Whoops'; };"
       "ReferenceError.prototype.toString = Object.prototype.toString;");
   CompileRun("asdf;");
   isolate->RemoveMessageListeners(check_reference_error_message);
 }
 
 
 static void check_custom_error_tostring(v8::Local<v8::Message> message,
                                         v8::Local<v8::Value> data) {
-  const char* uncaught_error = "Uncaught my name: my message";
+  const char* uncaught_error = "Uncaught MyError toString";
   CHECK(message->Get()
             ->Equals(CcTest::isolate()->GetCurrentContext(),
                      v8_str(uncaught_error))
             .FromJust());
 }
 
 
 TEST(CustomErrorToString) {
   LocalContext context;
   v8::HandleScope scope(context->GetIsolate());
   context->GetIsolate()->AddMessageListener(check_custom_error_tostring);
   CompileRun(
       "function MyError(name, message) {                   "
       "  this.name = name;                                 "
       "  this.message = message;                           "
       "}                                                   "
       "MyError.prototype = Object.create(Error.prototype); "
+      "MyError.prototype.toString = function() {           "
+      "  return 'MyError toString';                        "
+      "};                                                  "
       "throw new MyError('my name', 'my message');         ");
   context->GetIsolate()->RemoveMessageListeners(check_custom_error_tostring);
 }
 
 
 static void check_custom_error_message(v8::Local<v8::Message> message,
                                        v8::Local<v8::Value> data) {
   const char* uncaught_error = "Uncaught MyError: my message";
   printf("%s\n", *v8::String::Utf8Value(message->Get()));
   CHECK(message->Get()
@@ skipping 41 matching lines @@
       "}                                                   "
       "MyError.prototype = Object.create(Error.prototype); "
       "throw new MyError('my message');                    ");
 
   context->GetIsolate()->RemoveMessageListeners(check_custom_error_message);
 }
 
 
 static void check_custom_rethrowing_message(v8::Local<v8::Message> message,
                                             v8::Local<v8::Value> data) {
-  const char* uncaught_error = "Uncaught [object Object]";
+  const char* uncaught_error = "Uncaught exception";
   CHECK(message->Get()
             ->Equals(CcTest::isolate()->GetCurrentContext(),
                      v8_str(uncaught_error))
             .FromJust());
 }
 
 
 TEST(CustomErrorRethrowsOnToString) {
   LocalContext context;
   v8::HandleScope scope(context->GetIsolate());
@@ skipping 18117 matching lines @@
         env2->Global()->Set(env2.local(), v8_str("obj2"), object2).FromJust());
     ExpectString("typeof obj2.values", "function");
     CHECK_NE(*object->Get(v8_str("values")), *object2->Get(v8_str("values")));
 
     auto values2 = Local<Function>::Cast(object2->Get(v8_str("values")));
     auto fn2 = i::Handle<i::JSFunction>::cast(v8::Utils::OpenHandle(*values2));
     auto ctx2 = v8::Utils::OpenHandle(*env2.local());
     CHECK_EQ(fn2->GetCreationContext(), *ctx2);
   }
 }