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

Side by Side Diff: src/deoptimizer.cc

Issue 6116001: Use a separate marker value to allocate the arguments object on deoptimzation... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 11 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 | « src/assembler.cc ('k') | src/heap.h » ('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 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 output_offset); 611 output_offset);
612 literal->ShortPrint(); 612 literal->ShortPrint();
613 PrintF(" ; literal\n"); 613 PrintF(" ; literal\n");
614 } 614 }
615 intptr_t value = reinterpret_cast<intptr_t>(literal); 615 intptr_t value = reinterpret_cast<intptr_t>(literal);
616 output_[frame_index]->SetFrameSlot(output_offset, value); 616 output_[frame_index]->SetFrameSlot(output_offset, value);
617 return; 617 return;
618 } 618 }
619 619
620 case Translation::ARGUMENTS_OBJECT: { 620 case Translation::ARGUMENTS_OBJECT: {
621 // Use the hole value as a sentinel and fill in the arguments object 621 // Use the arguments marker value as a sentinel and fill in the arguments
622 // after the deoptimized frame is built. 622 // object after the deoptimized frame is built.
623 ASSERT(frame_index == 0); // Only supported for first frame. 623 ASSERT(frame_index == 0); // Only supported for first frame.
624 if (FLAG_trace_deopt) { 624 if (FLAG_trace_deopt) {
625 PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- ", 625 PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- ",
626 output_[frame_index]->GetTop() + output_offset, 626 output_[frame_index]->GetTop() + output_offset,
627 output_offset); 627 output_offset);
628 Heap::the_hole_value()->ShortPrint(); 628 Heap::arguments_marker()->ShortPrint();
629 PrintF(" ; arguments object\n"); 629 PrintF(" ; arguments object\n");
630 } 630 }
631 intptr_t value = reinterpret_cast<intptr_t>(Heap::the_hole_value()); 631 intptr_t value = reinterpret_cast<intptr_t>(Heap::arguments_marker());
632 output_[frame_index]->SetFrameSlot(output_offset, value); 632 output_[frame_index]->SetFrameSlot(output_offset, value);
633 return; 633 return;
634 } 634 }
635 } 635 }
636 } 636 }
637 637
638 638
639 bool Deoptimizer::DoOsrTranslateCommand(TranslationIterator* iterator, 639 bool Deoptimizer::DoOsrTranslateCommand(TranslationIterator* iterator,
640 int* input_offset) { 640 int* input_offset) {
641 disasm::NameConverter converter; 641 disasm::NameConverter converter;
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 Deoptimizer::HandleWeakDeoptimizedCode); 1138 Deoptimizer::HandleWeakDeoptimizedCode);
1139 } 1139 }
1140 1140
1141 1141
1142 DeoptimizingCodeListNode::~DeoptimizingCodeListNode() { 1142 DeoptimizingCodeListNode::~DeoptimizingCodeListNode() {
1143 GlobalHandles::Destroy(reinterpret_cast<Object**>(code_.location())); 1143 GlobalHandles::Destroy(reinterpret_cast<Object**>(code_.location()));
1144 } 1144 }
1145 1145
1146 1146
1147 } } // namespace v8::internal 1147 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/assembler.cc ('k') | src/heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698