| Index: test/cctest/test-debug.cc
|
| diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
|
| index a86317ad3861582b9a0e62fc4fe41018f8dd7d9c..f5e4f3a4fcd50dc23512c969d3a1f932a7334d0d 100644
|
| --- a/test/cctest/test-debug.cc
|
| +++ b/test/cctest/test-debug.cc
|
| @@ -487,9 +487,7 @@ void CheckDebugBreakFunction(DebugLocalContext* env,
|
| CHECK_EQ(debug_break,
|
| Code::GetCodeFromTargetAddress(it1.it()->rinfo()->target_address()));
|
| } else {
|
| - // TODO(1240753): Make the test architecture independent or split
|
| - // parts of the debugger into architecture dependent files.
|
| - CHECK_EQ(0xE8, *(it1.rinfo()->pc()));
|
| + CHECK(Debug::IsDebugBreakAtReturn(it1.it()->rinfo()));
|
| }
|
|
|
| // Clear the break point and check that the debug break function is no longer
|
| @@ -501,9 +499,7 @@ void CheckDebugBreakFunction(DebugLocalContext* env,
|
| it2.FindBreakLocationFromPosition(position);
|
| CHECK_EQ(mode, it2.it()->rinfo()->rmode());
|
| if (mode == v8::internal::RelocInfo::JS_RETURN) {
|
| - // TODO(1240753): Make the test architecture independent or split
|
| - // parts of the debugger into architecture dependent files.
|
| - CHECK_NE(0xE8, *(it2.rinfo()->pc()));
|
| + CHECK(!Debug::IsDebugBreakAtReturn(it2.it()->rinfo()));
|
| }
|
| }
|
|
|
|
|