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

Side by Side Diff: src/x64/codegen-x64.cc

Issue 173268: Revert change 2745 because of assertion failures in debug mode.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 3 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/debug.cc ('k') | test/mjsunit/debug-step-stub-callfunction.js » ('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 4568 matching lines...) Expand 10 before | Expand all | Expand 10 after
4579 4579
4580 // All extension objects were empty and it is safe to use a global 4580 // All extension objects were empty and it is safe to use a global
4581 // load IC call. 4581 // load IC call.
4582 LoadGlobal(); 4582 LoadGlobal();
4583 frame_->Push(slot->var()->name()); 4583 frame_->Push(slot->var()->name());
4584 RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF) 4584 RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF)
4585 ? RelocInfo::CODE_TARGET 4585 ? RelocInfo::CODE_TARGET
4586 : RelocInfo::CODE_TARGET_CONTEXT; 4586 : RelocInfo::CODE_TARGET_CONTEXT;
4587 Result answer = frame_->CallLoadIC(mode); 4587 Result answer = frame_->CallLoadIC(mode);
4588 // A test rax instruction following the call signals that the inobject 4588 // A test rax instruction following the call signals that the inobject
4589 // property case was inlined. Ensure that there is not a test eax 4589 // property case was inlined. Ensure that there is not a test rax
4590 // instruction here. 4590 // instruction here.
4591 masm_->nop(); 4591 masm_->nop();
4592 // Discard the global object. The result is in answer. 4592 // Discard the global object. The result is in answer.
4593 frame_->Drop(); 4593 frame_->Drop();
4594 return answer; 4594 return answer;
4595 } 4595 }
4596 4596
4597 4597
4598 void CodeGenerator::LoadGlobal() { 4598 void CodeGenerator::LoadGlobal() {
4599 if (in_spilled_code()) { 4599 if (in_spilled_code()) {
(...skipping 3098 matching lines...) Expand 10 before | Expand all | Expand 10 after
7698 int CompareStub::MinorKey() { 7698 int CompareStub::MinorKey() {
7699 // Encode the two parameters in a unique 16 bit value. 7699 // Encode the two parameters in a unique 16 bit value.
7700 ASSERT(static_cast<unsigned>(cc_) < (1 << 15)); 7700 ASSERT(static_cast<unsigned>(cc_) < (1 << 15));
7701 return (static_cast<unsigned>(cc_) << 1) | (strict_ ? 1 : 0); 7701 return (static_cast<unsigned>(cc_) << 1) | (strict_ ? 1 : 0);
7702 } 7702 }
7703 7703
7704 7704
7705 #undef __ 7705 #undef __
7706 7706
7707 } } // namespace v8::internal 7707 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/debug.cc ('k') | test/mjsunit/debug-step-stub-callfunction.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698