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

Side by Side Diff: src/jump-target-inl.h

Issue 661171: Merge r3962 to trunk (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 10 years, 9 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/jump-target.cc ('k') | src/register-allocator.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 10 matching lines...) Expand all
21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27
28 #ifndef V8_JUMP_TARGET_INL_H_ 28 #ifndef V8_JUMP_TARGET_INL_H_
29 #define V8_JUMP_TARGET_INL_H_ 29 #define V8_JUMP_TARGET_INL_H_
30 30
31 #include "virtual-frame-inl.h"
32
31 namespace v8 { 33 namespace v8 {
32 namespace internal { 34 namespace internal {
33 35
34 CodeGenerator* JumpTarget::cgen() { 36 CodeGenerator* JumpTarget::cgen() {
35 return CodeGeneratorScope::Current(); 37 return CodeGeneratorScope::Current();
36 } 38 }
37 39
38 void JumpTarget::InitializeEntryElement(int index, FrameElement* target) { 40 void JumpTarget::InitializeEntryElement(int index, FrameElement* target) {
39 entry_frame_->elements_[index].clear_copied(); 41 FrameElement* element = &entry_frame_->elements_[index];
42 element->clear_copied();
40 if (target->is_register()) { 43 if (target->is_register()) {
41 entry_frame_->set_register_location(target->reg(), index); 44 entry_frame_->set_register_location(target->reg(), index);
42 } else if (target->is_copy()) { 45 } else if (target->is_copy()) {
43 entry_frame_->elements_[target->index()].set_copied(); 46 entry_frame_->elements_[target->index()].set_copied();
44 } 47 }
45 if (direction_ == BIDIRECTIONAL && !target->is_copy()) { 48 if (direction_ == BIDIRECTIONAL && !target->is_copy()) {
46 entry_frame_->elements_[index].set_number_info(NumberInfo::kUnknown); 49 element->set_number_info(NumberInfo::kUnknown);
47 } 50 }
48 } 51 }
49 52
50 } } // namespace v8::internal 53 } } // namespace v8::internal
51 54
52 #endif // V8_JUMP_TARGET_INL_H_ 55 #endif // V8_JUMP_TARGET_INL_H_
OLDNEW
« no previous file with comments | « src/jump-target.cc ('k') | src/register-allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698