Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "src/isolate.h" | 5 #include "src/isolate.h" |
| 6 | 6 |
| 7 #include <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include <fstream> // NOLINT(readability/streams) | 9 #include <fstream> // NOLINT(readability/streams) |
| 10 #include <sstream> | 10 #include <sstream> |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 502 if (helper.IsStrictFrame(*fun)) flags |= FrameArray::kIsStrict; | 502 if (helper.IsStrictFrame(*fun)) flags |= FrameArray::kIsStrict; |
| 503 if (exit_frame->IsConstructor()) flags |= FrameArray::kForceConstructor; | 503 if (exit_frame->IsConstructor()) flags |= FrameArray::kForceConstructor; |
| 504 | 504 |
| 505 elements = FrameArray::AppendJSFrame(elements, recv, fun, | 505 elements = FrameArray::AppendJSFrame(elements, recv, fun, |
| 506 Handle<AbstractCode>::cast(code), | 506 Handle<AbstractCode>::cast(code), |
| 507 offset, flags); | 507 offset, flags); |
| 508 } break; | 508 } break; |
| 509 | 509 |
| 510 case StackFrame::WASM: { | 510 case StackFrame::WASM: { |
| 511 WasmFrame* wasm_frame = WasmFrame::cast(frame); | 511 WasmFrame* wasm_frame = WasmFrame::cast(frame); |
| 512 Handle<Object> wasm_object(wasm_frame->wasm_obj(), this); | 512 Handle<Object> wasm_module(wasm_frame->wasm_obj(), this); |
|
Mircea Trofin
2016/10/15 17:38:40
Could the renames be a separate change?
| |
| 513 const int wasm_function_index = wasm_frame->function_index(); | 513 const int wasm_function_index = wasm_frame->function_index(); |
| 514 Code* code = wasm_frame->unchecked_code(); | 514 Code* code = wasm_frame->unchecked_code(); |
| 515 Handle<AbstractCode> abstract_code(AbstractCode::cast(code), this); | 515 Handle<AbstractCode> abstract_code(AbstractCode::cast(code), this); |
| 516 const int offset = | 516 const int offset = |
| 517 static_cast<int>(wasm_frame->pc() - code->instruction_start()); | 517 static_cast<int>(wasm_frame->pc() - code->instruction_start()); |
| 518 | 518 |
| 519 // TODO(wasm): The wasm object returned by the WasmFrame should always | 519 // TODO(wasm): The wasm object returned by the WasmFrame should always |
| 520 // be a wasm object. | 520 // be a wasm object. |
| 521 DCHECK(wasm::IsWasmObject(*wasm_object) || | 521 DCHECK(wasm::IsWasmModule(*wasm_module) || |
| 522 wasm_object->IsUndefined(this)); | 522 wasm_module->IsUndefined(this)); |
| 523 | 523 |
| 524 int flags = wasm::WasmIsAsmJs(*wasm_object, this) | 524 int flags = wasm::WasmIsAsmJs(*wasm_module, this) |
| 525 ? FrameArray::kIsAsmJsWasmFrame | 525 ? FrameArray::kIsAsmJsWasmFrame |
| 526 : FrameArray::kIsWasmFrame; | 526 : FrameArray::kIsWasmFrame; |
| 527 | 527 |
| 528 elements = FrameArray::AppendWasmFrame(elements, wasm_object, | 528 elements = FrameArray::AppendWasmFrame(elements, wasm_module, |
| 529 wasm_function_index, | 529 wasm_function_index, |
| 530 abstract_code, offset, flags); | 530 abstract_code, offset, flags); |
| 531 } break; | 531 } break; |
| 532 | 532 |
| 533 default: | 533 default: |
| 534 break; | 534 break; |
| 535 } | 535 } |
| 536 } | 536 } |
| 537 | 537 |
| 538 elements->ShrinkToFit(); | 538 elements->ShrinkToFit(); |
| (...skipping 2912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3451 // Then check whether this scope intercepts. | 3451 // Then check whether this scope intercepts. |
| 3452 if ((flag & intercept_mask_)) { | 3452 if ((flag & intercept_mask_)) { |
| 3453 intercepted_flags_ |= flag; | 3453 intercepted_flags_ |= flag; |
| 3454 return true; | 3454 return true; |
| 3455 } | 3455 } |
| 3456 return false; | 3456 return false; |
| 3457 } | 3457 } |
| 3458 | 3458 |
| 3459 } // namespace internal | 3459 } // namespace internal |
| 3460 } // namespace v8 | 3460 } // namespace v8 |
| OLD | NEW |