Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: runtime/vm/clustered_snapshot.cc

Issue 2374273002: Fix a throw returning to a frame marked for lazy deopt that captures the stacktrace. (Closed)
Patch Set: . Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/clustered_snapshot.h" 5 #include "vm/clustered_snapshot.h"
6 6
7 #include "platform/assert.h" 7 #include "platform/assert.h"
8 #include "vm/bootstrap.h" 8 #include "vm/bootstrap.h"
9 #include "vm/class_finalizer.h" 9 #include "vm/class_finalizer.h"
10 #include "vm/dart.h" 10 #include "vm/dart.h"
(...skipping 1580 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 code->ptr()->var_descriptors_ = LocalVarDescriptors::null(); 1591 code->ptr()->var_descriptors_ = LocalVarDescriptors::null();
1592 code->ptr()->inlined_metadata_ = Array::null(); 1592 code->ptr()->inlined_metadata_ = Array::null();
1593 code->ptr()->code_source_map_ = CodeSourceMap::null(); 1593 code->ptr()->code_source_map_ = CodeSourceMap::null();
1594 code->ptr()->comments_ = Array::null(); 1594 code->ptr()->comments_ = Array::null();
1595 code->ptr()->return_address_metadata_ = Object::null(); 1595 code->ptr()->return_address_metadata_ = Object::null();
1596 1596
1597 code->ptr()->compile_timestamp_ = 0; 1597 code->ptr()->compile_timestamp_ = 0;
1598 #endif 1598 #endif
1599 code->ptr()->state_bits_ = d->Read<int32_t>(); 1599 code->ptr()->state_bits_ = d->Read<int32_t>();
1600 #if !defined(DART_PRECOMPILED_RUNTIME) 1600 #if !defined(DART_PRECOMPILED_RUNTIME)
1601 code->ptr()->lazy_deopt_pc_offset_ = -1; 1601 code->ptr()->lazy_deopt_return_pc_offset_ = -1;
1602 code->ptr()->lazy_deopt_throw_pc_offset_ = -1;
1602 #endif 1603 #endif
1603 } 1604 }
1604 } 1605 }
1605 }; 1606 };
1606 1607
1607 1608
1608 #if !defined(DART_PRECOMPILED_RUNTIME) 1609 #if !defined(DART_PRECOMPILED_RUNTIME)
1609 class ObjectPoolSerializationCluster : public SerializationCluster { 1610 class ObjectPoolSerializationCluster : public SerializationCluster {
1610 public: 1611 public:
1611 ObjectPoolSerializationCluster() { } 1612 ObjectPoolSerializationCluster() { }
(...skipping 3597 matching lines...) Expand 10 before | Expand all | Expand 10 after
5209 5210
5210 deserializer.ReadVMSnapshot(); 5211 deserializer.ReadVMSnapshot();
5211 5212
5212 Dart::set_instructions_snapshot_buffer(instructions_buffer_); 5213 Dart::set_instructions_snapshot_buffer(instructions_buffer_);
5213 Dart::set_data_snapshot_buffer(data_buffer_); 5214 Dart::set_data_snapshot_buffer(data_buffer_);
5214 5215
5215 return ApiError::null(); 5216 return ApiError::null();
5216 } 5217 }
5217 5218
5218 } // namespace dart 5219 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/code_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698