[console] correctly propagate exceptions.

R=jgruber@chromium.org

Bug: v8:6774
Change-Id: Ie87306e9d6cc1574f8e1cc9dde38853eda07fd09
Reviewed-on: https://chromium-review.googlesource.com/645127
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47745}

src/builtins/builtins-console.cc

@@ -61,14 +61,13 @@ void ConsoleCall(
   (isolate->console_delegate()->*func)(
       wrapper,
       v8::debug::ConsoleContext(context_id, Utils::ToLocal(context_name)));
-  CHECK(!isolate->has_pending_exception());
-  CHECK(!isolate->has_scheduled_exception());
 }
 }  // namespace
 
 #define CONSOLE_BUILTIN_IMPLEMENTATION(call, name)             \
   BUILTIN(Console##call) {                                     \
     ConsoleCall(isolate, args, &debug::ConsoleDelegate::call); \
+    RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);            \
     return isolate->heap()->undefined_value();                 \
   }
 CONSOLE_METHOD_LIST(CONSOLE_BUILTIN_IMPLEMENTATION)

src/d8-console.cc

@@ -14,16 +14,11 @@ void WriteToFile(FILE* file, Isolate* isolate,
     HandleScope handle_scope(isolate);
     if (i != 0) fprintf(file, " ");
 
-    // Explicitly catch potential exceptions in toString().
-    v8::TryCatch try_catch(isolate);
     Local<Value> arg = args[i];
     Local<String> str_obj;
 
     if (arg->IsSymbol()) arg = Local<Symbol>::Cast(arg)->Name();
-    if (!arg->ToString(isolate->GetCurrentContext()).ToLocal(&str_obj)) {
-      Shell::ReportException(isolate, &try_catch);
-      return;
-    }
+    if (!arg->ToString(isolate->GetCurrentContext()).ToLocal(&str_obj)) return;
 
     v8::String::Utf8Value str(isolate, str_obj);
     int n = static_cast<int>(fwrite(*str, sizeof(**str), str.length(), file));
@@ -73,10 +68,7 @@ void D8Console::Time(const debug::ConsoleCallArguments& args,
     Local<Value> arg = args[0];
     Local<String> label;
     v8::TryCatch try_catch(isolate_);
-    if (!arg->ToString(isolate_->GetCurrentContext()).ToLocal(&label)) {
-      Shell::ReportException(isolate_, &try_catch);
-      return;
-    }
+    if (!arg->ToString(isolate_->GetCurrentContext()).ToLocal(&label)) return;
     v8::String::Utf8Value utf8(isolate_, label);
     std::string string(*utf8);
     auto find = timers_.find(string);
@@ -100,10 +92,7 @@ void D8Console::TimeEnd(const debug::ConsoleCallArguments& args,
     Local<Value> arg = args[0];
     Local<String> label;
     v8::TryCatch try_catch(isolate_);
-    if (!arg->ToString(isolate_->GetCurrentContext()).ToLocal(&label)) {
-      Shell::ReportException(isolate_, &try_catch);
-      return;
-    }
+    if (!arg->ToString(isolate_->GetCurrentContext()).ToLocal(&label)) return;
     v8::String::Utf8Value utf8(isolate_, label);
     std::string string(*utf8);
     auto find = timers_.find(string);

test/cctest/test-thread-termination.cc

@@ -595,3 +595,29 @@ TEST(TerminateAndTryCall) {
   CHECK_EQ(4, result.FromJust());
   CHECK(!isolate->IsExecutionTerminating());
 }
+
+class ConsoleImpl : public v8::debug::ConsoleDelegate {
+ private:
+  void Log(const v8::debug::ConsoleCallArguments& args,
+           const v8::debug::ConsoleContext&) override {
+    CompileRun("1 + 1");
+  }
+};
+
+TEST(TerminateConsole) {
+  i::FLAG_allow_natives_syntax = true;
+  v8::Isolate* isolate = CcTest::isolate();
+  ConsoleImpl console;
+  v8::debug::SetConsoleDelegate(isolate, &console);
+  v8::HandleScope scope(isolate);
+  v8::Local<v8::ObjectTemplate> global = CreateGlobalTemplate(
+      isolate, TerminateCurrentThread, DoLoopCancelTerminate);
+  v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
+  v8::Context::Scope context_scope(context);
+  CHECK(!isolate->IsExecutionTerminating());
+  v8::TryCatch try_catch(isolate);
+  CHECK(!isolate->IsExecutionTerminating());
+  CHECK(CompileRun("terminate(); console.log(); fail();").IsEmpty());
+  CHECK(try_catch.HasCaught());
+  CHECK(!isolate->IsExecutionTerminating());
+}

test/mjsunit/regress/regress-719380.js

@@ -3,5 +3,5 @@
 // found in the LICENSE file.
 
 TypeError.prototype.__defineGetter__("name", () => { throw 42; });
-console.log({ toString: () => { throw new TypeError() }});
+try { console.log({ toString: () => { throw new TypeError() }}); } catch (e) {}
 try { new WebAssembly.Table({}); } catch (e) {}

test/mjsunit/regress/regress-crbug-714696.js

@@ -5,6 +5,6 @@
 if (this.Intl) {
   new Intl.v8BreakIterator();
   new Intl.DateTimeFormat();
-  console.log({ toString: function() { throw 1; }});
+  try { console.log({ toString: function() { throw 1; }}); } catch (e) {}
   new Intl.v8BreakIterator();
 }