| Index: test/cctest/test-debug.cc
|
| diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
|
| index 87f9cab97bdce4351153992d6b1ff4d0112d6124..70b73e5adc9a405a67c87341266ce79bb95fdff0 100644
|
| --- a/test/cctest/test-debug.cc
|
| +++ b/test/cctest/test-debug.cc
|
| @@ -489,7 +489,11 @@ void CheckDebugBreakFunction(DebugLocalContext* env,
|
| CHECK(Debug::HasDebugInfo(shared));
|
| TestBreakLocationIterator it1(Debug::GetDebugInfo(shared));
|
| it1.FindBreakLocationFromPosition(position);
|
| - CHECK_EQ(mode, it1.it()->rinfo()->rmode());
|
| + v8::internal::RelocInfo::Mode actual_mode = it1.it()->rinfo()->rmode();
|
| + if (actual_mode == v8::internal::RelocInfo::CODE_TARGET_WITH_ID) {
|
| + actual_mode = v8::internal::RelocInfo::CODE_TARGET;
|
| + }
|
| + CHECK_EQ(mode, actual_mode);
|
| if (mode != v8::internal::RelocInfo::JS_RETURN) {
|
| CHECK_EQ(debug_break,
|
| Code::GetCodeFromTargetAddress(it1.it()->rinfo()->target_address()));
|
| @@ -504,7 +508,11 @@ void CheckDebugBreakFunction(DebugLocalContext* env,
|
| CHECK(Debug::EnsureDebugInfo(shared));
|
| TestBreakLocationIterator it2(Debug::GetDebugInfo(shared));
|
| it2.FindBreakLocationFromPosition(position);
|
| - CHECK_EQ(mode, it2.it()->rinfo()->rmode());
|
| + actual_mode = it2.it()->rinfo()->rmode();
|
| + if (actual_mode == v8::internal::RelocInfo::CODE_TARGET_WITH_ID) {
|
| + actual_mode = v8::internal::RelocInfo::CODE_TARGET;
|
| + }
|
| + CHECK_EQ(mode, actual_mode);
|
| if (mode == v8::internal::RelocInfo::JS_RETURN) {
|
| CHECK(!Debug::IsDebugBreakAtReturn(it2.it()->rinfo()));
|
| }
|
|
|