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

Side by Side Diff: src/arm/lithium-codegen-arm.cc

Issue 16848020: Always reset allowed OSR nesting level when reverting interrupt code patches. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | src/deoptimizer.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 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 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 } 818 }
819 819
820 ASSERT(FLAG_deopt_every_n_times < 2); // Other values not supported on ARM. 820 ASSERT(FLAG_deopt_every_n_times < 2); // Other values not supported on ARM.
821 if (FLAG_deopt_every_n_times == 1 && 821 if (FLAG_deopt_every_n_times == 1 &&
822 !info()->IsStub() && 822 !info()->IsStub() &&
823 info()->opt_count() == id) { 823 info()->opt_count() == id) {
824 __ Jump(entry, RelocInfo::RUNTIME_ENTRY); 824 __ Jump(entry, RelocInfo::RUNTIME_ENTRY);
825 return; 825 return;
826 } 826 }
827 827
828 if (FLAG_trap_on_deopt) { 828 if (FLAG_trap_on_deopt && info()->IsOptimizing()) {
829 __ stop("trap_on_deopt", cc); 829 __ stop("trap_on_deopt", cc);
830 } 830 }
831 831
832 ASSERT(info()->IsStub() || frame_is_built_); 832 ASSERT(info()->IsStub() || frame_is_built_);
833 bool needs_lazy_deopt = info()->IsStub(); 833 bool needs_lazy_deopt = info()->IsStub();
834 if (cc == al && frame_is_built_) { 834 if (cc == al && frame_is_built_) {
835 if (needs_lazy_deopt) { 835 if (needs_lazy_deopt) {
836 __ Call(entry, RelocInfo::RUNTIME_ENTRY); 836 __ Call(entry, RelocInfo::RUNTIME_ENTRY);
837 } else { 837 } else {
838 __ Jump(entry, RelocInfo::RUNTIME_ENTRY); 838 __ Jump(entry, RelocInfo::RUNTIME_ENTRY);
(...skipping 5041 matching lines...) Expand 10 before | Expand all | Expand 10 after
5880 __ sub(scratch, result, Operand::PointerOffsetFromSmiKey(index)); 5880 __ sub(scratch, result, Operand::PointerOffsetFromSmiKey(index));
5881 __ ldr(result, FieldMemOperand(scratch, 5881 __ ldr(result, FieldMemOperand(scratch,
5882 FixedArray::kHeaderSize - kPointerSize)); 5882 FixedArray::kHeaderSize - kPointerSize));
5883 __ bind(&done); 5883 __ bind(&done);
5884 } 5884 }
5885 5885
5886 5886
5887 #undef __ 5887 #undef __
5888 5888
5889 } } // namespace v8::internal 5889 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/deoptimizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698