AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[refactor] Change method names in FrameArrayIterator

Browse Source 
This CL changes 'HasNext' to 'HasFrame' and 'Next' to 'Advance' to
better reflect the semantics of the iterator.
'Next' usually returns the next element.

R=jgruber@chromium.org

Bug: v8:8562
Change-Id: Idbd1c084c39dd4a10c1c6a6db7782637b9b16cc4
Reviewed-on: https://chromium-review.googlesource.com/c/1436023
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Simon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59117}
This commit is contained in:
Simon Zünd 2019-01-28 11:51:07 +01:00 committed by Commit Bot
parent 7613345248
commit 147d05011d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/messages.cc
View File

@ -838,33 +838,33 @@ MaybeHandle<String> AsmJsWasmStackFrame::ToString() {
FrameArrayIterator::FrameArrayIterator(Isolate* isolate,
Handle<FrameArray> array, int frame_ix)
: isolate_(isolate), array_(array), next_frame_ix_(frame_ix) {}
: isolate_(isolate), array_(array), frame_ix_(frame_ix) {}
bool FrameArrayIterator::HasNext() const {
return (next_frame_ix_ < array_->FrameCount());
bool FrameArrayIterator::HasFrame() const {
return (frame_ix_ < array_->FrameCount());
}
void FrameArrayIterator::Next() { next_frame_ix_++; }
void FrameArrayIterator::Advance() { frame_ix_++; }
StackFrameBase* FrameArrayIterator::Frame() {
DCHECK(HasNext());
const int flags = array_->Flags(next_frame_ix_)->value();
DCHECK(HasFrame());
const int flags = array_->Flags(frame_ix_)->value();
int flag_mask = FrameArray::kIsWasmFrame |
FrameArray::kIsWasmInterpretedFrame |
FrameArray::kIsAsmJsWasmFrame;
switch (flags & flag_mask) {
case 0:
// JavaScript Frame.
js_frame_.FromFrameArray(isolate_, array_, next_frame_ix_);
js_frame_.FromFrameArray(isolate_, array_, frame_ix_);
return &js_frame_;
case FrameArray::kIsWasmFrame:
case FrameArray::kIsWasmInterpretedFrame:
// Wasm Frame:
wasm_frame_.FromFrameArray(isolate_, array_, next_frame_ix_);
wasm_frame_.FromFrameArray(isolate_, array_, frame_ix_);
return &wasm_frame_;
case FrameArray::kIsAsmJsWasmFrame:
// Asm.js Wasm Frame:
asm_wasm_frame_.FromFrameArray(isolate_, array_, next_frame_ix_);
asm_wasm_frame_.FromFrameArray(isolate_, array_, frame_ix_);
return &asm_wasm_frame_;
default:
UNREACHABLE();
@ -1040,7 +1040,7 @@ MaybeHandle<Object> ErrorUtils::FormatStackTrace(Isolate* isolate,
RETURN_ON_EXCEPTION(isolate, AppendErrorString(isolate, error, &builder),
Object);
for (FrameArrayIterator it(isolate, elems); it.HasNext(); it.Next()) {
for (FrameArrayIterator it(isolate, elems); it.HasFrame(); it.Advance()) {
builder.AppendCString("\n at ");
StackFrameBase* frame = it.Frame();

6
src/messages.h
View File

@ -222,14 +222,14 @@ class FrameArrayIterator {
StackFrameBase* Frame();
bool HasNext() const;
void Next();
bool HasFrame() const;
void Advance();
private:
Isolate* isolate_;
Handle<FrameArray> array_;
int next_frame_ix_;
int frame_ix_;
WasmStackFrame wasm_frame_;
AsmJsWasmStackFrame asm_wasm_frame_;