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

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

Issue 2183993004: DBC: Add missing deopt info after stack overflow checks. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: . Created 4 years, 4 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
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/globals.h" // Needed here to get TARGET_ARCH_DBC. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_DBC.
6 #if defined(TARGET_ARCH_DBC) 6 #if defined(TARGET_ARCH_DBC)
7 7
8 #include "vm/intermediate_language.h" 8 #include "vm/intermediate_language.h"
9 9
10 #include "vm/cpu.h" 10 #include "vm/cpu.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 266
267 EMIT_NATIVE_CODE(Stop, 0) { 267 EMIT_NATIVE_CODE(Stop, 0) {
268 __ Stop(message()); 268 __ Stop(message());
269 } 269 }
270 270
271 271
272 EMIT_NATIVE_CODE(CheckStackOverflow, 272 EMIT_NATIVE_CODE(CheckStackOverflow,
273 0, Location::NoLocation(), 273 0, Location::NoLocation(),
274 LocationSummary::kCall) { 274 LocationSummary::kCall) {
275 __ CheckStack(); 275 __ CheckStack();
276 compiler->AddCurrentDescriptor(RawPcDescriptors::kOther,
277 deopt_id(),
278 token_pos());
276 compiler->RecordSafepoint(locs()); 279 compiler->RecordSafepoint(locs());
zra 2016/07/27 17:22:06 See if you can do FlowGraphCompiler::RecordAfterCa
rmacnak 2016/07/27 17:47:57 Yes, much better.
277 compiler->AddCurrentDescriptor(RawPcDescriptors::kRuntimeCall, 280 ASSERT(deopt_id() != Thread::kNoDeoptId);
278 Thread::kNoDeoptId, 281 const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id());
279 token_pos()); 282 // Marks either the continuation point in unoptimized code or the
283 // deoptimization point in optimized code, after call.
284 if (compiler->is_optimizing()) {
285 compiler->AddDeoptIndexAtCall(deopt_id_after, token_pos());
286 } else {
287 // Add deoptimization continuation point after the call and before the
288 // arguments are removed.
289 compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
290 deopt_id_after,
291 token_pos());
292 }
280 } 293 }
281 294
282 295
283 EMIT_NATIVE_CODE(PushArgument, 1) { 296 EMIT_NATIVE_CODE(PushArgument, 1) {
284 if (compiler->is_optimizing()) { 297 if (compiler->is_optimizing()) {
285 __ Push(locs()->in(0).reg()); 298 __ Push(locs()->in(0).reg());
286 } 299 }
287 } 300 }
288 301
289 302
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 __ IfULe(length, index); 1611 __ IfULe(length, index);
1599 compiler->EmitDeopt(deopt_id(), 1612 compiler->EmitDeopt(deopt_id(),
1600 ICData::kDeoptCheckArrayBound, 1613 ICData::kDeoptCheckArrayBound,
1601 (generalized_ ? ICData::kGeneralized : 0) | 1614 (generalized_ ? ICData::kGeneralized : 0) |
1602 (licm_hoisted_ ? ICData::kHoisted : 0)); 1615 (licm_hoisted_ ? ICData::kHoisted : 0));
1603 } 1616 }
1604 1617
1605 } // namespace dart 1618 } // namespace dart
1606 1619
1607 #endif // defined TARGET_ARCH_DBC 1620 #endif // defined TARGET_ARCH_DBC
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698