| 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 // TODO(1233797): The frame hierarchy needs to change. It's | 329 // TODO(1233797): The frame hierarchy needs to change. It's |
| 330 // problematic that we can't use the safe-cast operator to cast to | 330 // problematic that we can't use the safe-cast operator to cast to |
| 331 // the JavaScript frame type, because we may encounter arguments | 331 // the JavaScript frame type, because we may encounter arguments |
| 332 // adaptor frames. | 332 // adaptor frames. |
| 333 StackFrame* frame = iterator_.frame(); | 333 StackFrame* frame = iterator_.frame(); |
| 334 ASSERT(frame->is_java_script() || frame->is_arguments_adaptor()); | 334 ASSERT(frame->is_java_script() || frame->is_arguments_adaptor()); |
| 335 return static_cast<JavaScriptFrame*>(frame); | 335 return static_cast<JavaScriptFrame*>(frame); |
| 336 } | 336 } |
| 337 | 337 |
| 338 | 338 |
| 339 inline JavaScriptFrame* SafeStackFrameIterator::frame() const { | 339 inline StackFrame* SafeStackFrameIterator::frame() const { |
| 340 ASSERT(!done()); | 340 ASSERT(!done()); |
| 341 ASSERT(frame_->is_java_script()); | 341 ASSERT(frame_->is_java_script() || frame_->is_exit()); |
| 342 return static_cast<JavaScriptFrame*>(frame_); | 342 return frame_; |
| 343 } | 343 } |
| 344 | 344 |
| 345 | 345 |
| 346 } } // namespace v8::internal | 346 } } // namespace v8::internal |
| 347 | 347 |
| 348 #endif // V8_FRAMES_INL_H_ | 348 #endif // V8_FRAMES_INL_H_ |
| OLD | NEW |