OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 } | 403 } |
404 | 404 |
405 | 405 |
406 bool BreakLocationIterator::IsStepInLocation(Isolate* isolate) { | 406 bool BreakLocationIterator::IsStepInLocation(Isolate* isolate) { |
407 if (RelocInfo::IsConstructCall(rmode())) { | 407 if (RelocInfo::IsConstructCall(rmode())) { |
408 return true; | 408 return true; |
409 } else if (RelocInfo::IsCodeTarget(rmode())) { | 409 } else if (RelocInfo::IsCodeTarget(rmode())) { |
410 HandleScope scope(debug_info_->GetIsolate()); | 410 HandleScope scope(debug_info_->GetIsolate()); |
411 Address target = rinfo()->target_address(); | 411 Address target = rinfo()->target_address(); |
412 Handle<Code> target_code(Code::GetCodeFromTargetAddress(target)); | 412 Handle<Code> target_code(Code::GetCodeFromTargetAddress(target)); |
| 413 if (target_code->kind() == Code::STUB) { |
| 414 return target_code->major_key() == CodeStub::CallFunction; |
| 415 } |
413 return target_code->is_call_stub() || target_code->is_keyed_call_stub(); | 416 return target_code->is_call_stub() || target_code->is_keyed_call_stub(); |
414 } else { | 417 } else { |
415 return false; | 418 return false; |
416 } | 419 } |
417 } | 420 } |
418 | 421 |
419 | 422 |
420 void BreakLocationIterator::PrepareStepIn(Isolate* isolate) { | 423 void BreakLocationIterator::PrepareStepIn(Isolate* isolate) { |
421 HandleScope scope(isolate); | 424 HandleScope scope(isolate); |
422 | 425 |
(...skipping 3436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3859 { | 3862 { |
3860 Locker locker(reinterpret_cast<v8::Isolate*>(isolate_)); | 3863 Locker locker(reinterpret_cast<v8::Isolate*>(isolate_)); |
3861 isolate_->debugger()->CallMessageDispatchHandler(); | 3864 isolate_->debugger()->CallMessageDispatchHandler(); |
3862 } | 3865 } |
3863 } | 3866 } |
3864 } | 3867 } |
3865 | 3868 |
3866 #endif // ENABLE_DEBUGGER_SUPPORT | 3869 #endif // ENABLE_DEBUGGER_SUPPORT |
3867 | 3870 |
3868 } } // namespace v8::internal | 3871 } } // namespace v8::internal |
OLD | NEW |