Fix failing tests and rollback two from Testing change for failing unit test

Review URL: http://codereview.chromium.org/3052026

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5153 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
peter.rybin@gmail.com 2010-07-29 21:29:45 +00:00
parent fdab0bafbb
commit c3bd79e471
2 changed files with 6 additions and 3 deletions

View File

@ -1787,9 +1787,7 @@ void Debug::FramesHaveBeenDropped(StackFrame::Id new_break_frame_id,
thread_local_.frame_drop_mode_ = mode; thread_local_.frame_drop_mode_ = mode;
thread_local_.break_frame_id_ = new_break_frame_id; thread_local_.break_frame_id_ = new_break_frame_id;
thread_local_.restarter_frame_function_pointer_ = thread_local_.restarter_frame_function_pointer_ =
// Temporary disabled for failing test investigation. restarter_frame_function_pointer;
// restarter_frame_function_pointer;
NULL;
} }

View File

@ -237,6 +237,10 @@ void ExternalReferenceTable::PopulateTable() {
DEBUG_ADDRESS, DEBUG_ADDRESS,
Debug::k_debug_break_return_address << kDebugIdShift, Debug::k_debug_break_return_address << kDebugIdShift,
"Debug::debug_break_return_address()"); "Debug::debug_break_return_address()");
Add(Debug_Address(Debug::k_restarter_frame_function_pointer).address(),
DEBUG_ADDRESS,
Debug::k_restarter_frame_function_pointer << kDebugIdShift,
"Debug::restarter_frame_function_pointer_address()");
const char* debug_register_format = "Debug::register_address(%i)"; const char* debug_register_format = "Debug::register_address(%i)";
int dr_format_length = StrLength(debug_register_format); int dr_format_length = StrLength(debug_register_format);
for (int i = 0; i < kNumJSCallerSaved; ++i) { for (int i = 0; i < kNumJSCallerSaved; ++i) {
@ -478,6 +482,7 @@ ExternalReferenceEncoder::ExternalReferenceEncoder()
uint32_t ExternalReferenceEncoder::Encode(Address key) const { uint32_t ExternalReferenceEncoder::Encode(Address key) const {
int index = IndexOf(key); int index = IndexOf(key);
ASSERT(key == NULL || index >= 0);
return index >=0 ? ExternalReferenceTable::instance()->code(index) : 0; return index >=0 ? ExternalReferenceTable::instance()->code(index) : 0;
} }