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

Side by Side Diff: src/ic-inl.h

Issue 91803003: Move responsibility for definition of ExtraICState bits into the ICs. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: A couple more nits. Created 7 years 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/ic.cc ('k') | src/mips/ic-mips.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 void IC::SetTargetAtAddress(Address address, Code* target) { 80 void IC::SetTargetAtAddress(Address address, Code* target) {
81 ASSERT(target->is_inline_cache_stub() || target->is_compare_ic_stub()); 81 ASSERT(target->is_inline_cache_stub() || target->is_compare_ic_stub());
82 Heap* heap = target->GetHeap(); 82 Heap* heap = target->GetHeap();
83 Code* old_target = GetTargetAtAddress(address); 83 Code* old_target = GetTargetAtAddress(address);
84 #ifdef DEBUG 84 #ifdef DEBUG
85 // STORE_IC and KEYED_STORE_IC use Code::extra_ic_state() to mark 85 // STORE_IC and KEYED_STORE_IC use Code::extra_ic_state() to mark
86 // ICs as strict mode. The strict-ness of the IC must be preserved. 86 // ICs as strict mode. The strict-ness of the IC must be preserved.
87 if (old_target->kind() == Code::STORE_IC || 87 if (old_target->kind() == Code::STORE_IC ||
88 old_target->kind() == Code::KEYED_STORE_IC) { 88 old_target->kind() == Code::KEYED_STORE_IC) {
89 ASSERT(Code::GetStrictMode(old_target->extra_ic_state()) == 89 ASSERT(StoreIC::GetStrictMode(old_target->extra_ic_state()) ==
90 Code::GetStrictMode(target->extra_ic_state())); 90 StoreIC::GetStrictMode(target->extra_ic_state()));
91 } 91 }
92 #endif 92 #endif
93 Assembler::set_target_address_at(address, target->instruction_start()); 93 Assembler::set_target_address_at(address, target->instruction_start());
94 if (heap->gc_state() == Heap::MARK_COMPACT) { 94 if (heap->gc_state() == Heap::MARK_COMPACT) {
95 heap->mark_compact_collector()->RecordCodeTargetPatch(address, target); 95 heap->mark_compact_collector()->RecordCodeTargetPatch(address, target);
96 } else { 96 } else {
97 heap->incremental_marking()->RecordCodeTargetPatch(address, target); 97 heap->incremental_marking()->RecordCodeTargetPatch(address, target);
98 } 98 }
99 PostPatching(address, target, old_target); 99 PostPatching(address, target, old_target);
100 } 100 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 149 }
150 return handle(JSObject::cast(constructor->instance_prototype())->map()); 150 return handle(JSObject::cast(constructor->instance_prototype())->map());
151 } 151 }
152 return TypeToMap(type, isolate); 152 return TypeToMap(type, isolate);
153 } 153 }
154 154
155 155
156 } } // namespace v8::internal 156 } } // namespace v8::internal
157 157
158 #endif // V8_IC_INL_H_ 158 #endif // V8_IC_INL_H_
OLDNEW
« no previous file with comments | « src/ic.cc ('k') | src/mips/ic-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698