OLD | NEW |
1 // Copyright 2007-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2007-2008 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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 } else if (RelocInfo::IsJSReturn(rmode)) { | 429 } else if (RelocInfo::IsJSReturn(rmode)) { |
430 CHECK(!Debug::IsDebugBreakAtReturn(it.rinfo())); | 430 CHECK(!Debug::IsDebugBreakAtReturn(it.rinfo())); |
431 } | 431 } |
432 } | 432 } |
433 } | 433 } |
434 } | 434 } |
435 } | 435 } |
436 } | 436 } |
437 | 437 |
438 | 438 |
| 439 void ForceUnloadDebugger() { |
| 440 Debugger::never_unload_debugger_ = false; |
| 441 Debugger::UnloadDebugger(); |
| 442 } |
| 443 |
| 444 |
439 } } // namespace v8::internal | 445 } } // namespace v8::internal |
440 | 446 |
441 | 447 |
442 // Check that the debugger has been fully unloaded. | 448 // Check that the debugger has been fully unloaded. |
443 static void CheckDebuggerUnloaded(bool check_functions = false) { | 449 static void CheckDebuggerUnloaded(bool check_functions = false) { |
444 // Let debugger to unload itself synchronously | 450 // Let debugger to unload itself synchronously |
445 v8::Debug::ProcessDebugMessages(); | 451 v8::Debug::ProcessDebugMessages(); |
446 | 452 |
447 v8::internal::CheckDebuggerUnloaded(check_functions); | 453 v8::internal::CheckDebuggerUnloaded(check_functions); |
448 } | 454 } |
(...skipping 5690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6139 debugger_context = v8::Handle<v8::Context>(); | 6145 debugger_context = v8::Handle<v8::Context>(); |
6140 CheckDebuggerUnloaded(); | 6146 CheckDebuggerUnloaded(); |
6141 } | 6147 } |
6142 | 6148 |
6143 | 6149 |
6144 TEST(DebugContextIsPreservedBetweenAccesses) { | 6150 TEST(DebugContextIsPreservedBetweenAccesses) { |
6145 v8::HandleScope scope; | 6151 v8::HandleScope scope; |
6146 v8::Local<v8::Context> context1 = v8::Debug::GetDebugContext(); | 6152 v8::Local<v8::Context> context1 = v8::Debug::GetDebugContext(); |
6147 v8::Local<v8::Context> context2 = v8::Debug::GetDebugContext(); | 6153 v8::Local<v8::Context> context2 = v8::Debug::GetDebugContext(); |
6148 CHECK_EQ(*context1, *context2); | 6154 CHECK_EQ(*context1, *context2); |
| 6155 // Make sure debugger is unloaded before running other tests. |
| 6156 v8::internal::ForceUnloadDebugger(); |
| 6157 CheckDebuggerUnloaded(); |
6149 } | 6158 } |
6150 | 6159 |
OLD | NEW |