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

Side by Side Diff: src/ia32/macro-assembler-ia32.cc

Issue 7291001: Remove bogus assertion. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 5 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/x64/macro-assembler-x64.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1759 for (int i = 1; i < context_chain_length; i++) { 1759 for (int i = 1; i < context_chain_length; i++) {
1760 mov(dst, Operand(dst, Context::SlotOffset(Context::PREVIOUS_INDEX))); 1760 mov(dst, Operand(dst, Context::SlotOffset(Context::PREVIOUS_INDEX)));
1761 } 1761 }
1762 } else { 1762 } else {
1763 // Slot is in the current function context. Move it into the 1763 // Slot is in the current function context. Move it into the
1764 // destination register in case we store into it (the write barrier 1764 // destination register in case we store into it (the write barrier
1765 // cannot be allowed to destroy the context in esi). 1765 // cannot be allowed to destroy the context in esi).
1766 mov(dst, esi); 1766 mov(dst, esi);
1767 } 1767 }
1768 1768
1769 // We should not have found a with or catch context by walking the context 1769 // We should not have found a with context by walking the context chain
1770 // chain (i.e., the static scope chain and runtime context chain do not 1770 // (i.e., the static scope chain and runtime context chain do not agree).
1771 // agree). A variable occurring in such a scope should have slot type 1771 // A variable occurring in such a scope should have slot type LOOKUP and
1772 // LOOKUP and not CONTEXT. 1772 // not CONTEXT.
1773 if (emit_debug_code()) { 1773 if (emit_debug_code()) {
1774 cmp(FieldOperand(dst, HeapObject::kMapOffset), 1774 cmp(FieldOperand(dst, HeapObject::kMapOffset),
1775 isolate()->factory()->with_context_map()); 1775 isolate()->factory()->with_context_map());
1776 Check(not_equal, "Variable resolved to with context."); 1776 Check(not_equal, "Variable resolved to with context.");
1777 cmp(FieldOperand(dst, HeapObject::kMapOffset),
1778 isolate()->factory()->with_context_map());
1779 Check(not_equal, "Variable resolved to catch context.");
1780 } 1777 }
1781 } 1778 }
1782 1779
1783 1780
1784 void MacroAssembler::LoadGlobalFunction(int index, Register function) { 1781 void MacroAssembler::LoadGlobalFunction(int index, Register function) {
1785 // Load the global or builtins object from the current context. 1782 // Load the global or builtins object from the current context.
1786 mov(function, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX))); 1783 mov(function, Operand(esi, Context::SlotOffset(Context::GLOBAL_INDEX)));
1787 // Load the global context from the global or builtins object. 1784 // Load the global context from the global or builtins object.
1788 mov(function, FieldOperand(function, GlobalObject::kGlobalContextOffset)); 1785 mov(function, FieldOperand(function, GlobalObject::kGlobalContextOffset));
1789 // Load the function from the global context. 1786 // Load the function from the global context.
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
2134 2131
2135 // Check that the code was patched as expected. 2132 // Check that the code was patched as expected.
2136 ASSERT(masm_.pc_ == address_ + size_); 2133 ASSERT(masm_.pc_ == address_ + size_);
2137 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap); 2134 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
2138 } 2135 }
2139 2136
2140 2137
2141 } } // namespace v8::internal 2138 } } // namespace v8::internal
2142 2139
2143 #endif // V8_TARGET_ARCH_IA32 2140 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | src/x64/macro-assembler-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698