From addca7072549d790f1e6862be08937880bddbef5 Mon Sep 17 00:00:00 2001 From: mstarzinger Date: Thu, 19 Mar 2015 05:40:51 -0700 Subject: [PATCH] [turbofan] Remove stale TODO from FunctionTester. R=titzer@chromium.org TEST=cctest/test-run-jsexceptions Review URL: https://codereview.chromium.org/1022463003 Cr-Commit-Position: refs/heads/master@{#27300} --- test/cctest/compiler/function-tester.h | 5 +---- test/cctest/compiler/test-run-jsexceptions.cc | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/test/cctest/compiler/function-tester.h b/test/cctest/compiler/function-tester.h index 3881f09..56dc0a9 100644 --- a/test/cctest/compiler/function-tester.h +++ b/test/cctest/compiler/function-tester.h @@ -61,7 +61,6 @@ class FunctionTester : public InitializedHandleScope { CHECK(isolate->has_pending_exception()); CHECK(try_catch.HasCaught()); CHECK(no_result.is_null()); - // TODO(mstarzinger): Temporary workaround for issue chromium:362388. isolate->OptionalRescheduleException(true); } @@ -72,10 +71,8 @@ class FunctionTester : public InitializedHandleScope { CHECK(isolate->has_pending_exception()); CHECK(try_catch.HasCaught()); CHECK(no_result.is_null()); - // TODO(mstarzinger): Calling OptionalRescheduleException is a dirty hack, - // it's the only way to make Message() not to assert because an external - // exception has been caught by the try_catch. isolate->OptionalRescheduleException(true); + CHECK(!try_catch.Message().IsEmpty()); return try_catch.Message(); } diff --git a/test/cctest/compiler/test-run-jsexceptions.cc b/test/cctest/compiler/test-run-jsexceptions.cc index 9b31fe0..272311a 100644 --- a/test/cctest/compiler/test-run-jsexceptions.cc +++ b/test/cctest/compiler/test-run-jsexceptions.cc @@ -31,17 +31,14 @@ TEST(ThrowMessagePosition) { v8::Handle message; message = T.CheckThrowsReturnMessage(T.Val(1), T.undefined()); - CHECK(!message.IsEmpty()); CHECK_EQ(2, message->GetLineNumber()); CHECK_EQ(40, message->GetStartPosition()); message = T.CheckThrowsReturnMessage(T.Val(2), T.undefined()); - CHECK(!message.IsEmpty()); CHECK_EQ(3, message->GetLineNumber()); CHECK_EQ(67, message->GetStartPosition()); message = T.CheckThrowsReturnMessage(T.Val(3), T.undefined()); - CHECK(!message.IsEmpty()); CHECK_EQ(4, message->GetLineNumber()); CHECK_EQ(95, message->GetStartPosition()); } @@ -57,11 +54,9 @@ TEST(ThrowMessageDirectly) { v8::Handle message; message = T.CheckThrowsReturnMessage(T.false_value(), T.Val("Wat?")); - CHECK(!message.IsEmpty()); CHECK(message->Get()->Equals(v8_str("Uncaught Error: Wat?"))); message = T.CheckThrowsReturnMessage(T.true_value(), T.Val("Kaboom!")); - CHECK(!message.IsEmpty()); CHECK(message->Get()->Equals(v8_str("Uncaught Kaboom!"))); } @@ -80,11 +75,9 @@ TEST(ThrowMessageIndirectly) { v8::Handle message; message = T.CheckThrowsReturnMessage(T.false_value(), T.Val("Wat?")); - CHECK(!message.IsEmpty()); CHECK(message->Get()->Equals(v8_str("Uncaught Error: Wat?"))); message = T.CheckThrowsReturnMessage(T.true_value(), T.Val("Kaboom!")); - CHECK(!message.IsEmpty()); CHECK(message->Get()->Equals(v8_str("Uncaught Kaboom!"))); } -- 2.7.4