Chromium Code Reviews| Index: src/code-stubs.cc |
| =================================================================== |
| --- src/code-stubs.cc (revision 5816) |
| +++ src/code-stubs.cc (working copy) |
| @@ -37,7 +37,6 @@ |
| namespace internal { |
| bool CodeStub::FindCodeInCache(Code** code_out) { |
| - if (has_custom_cache()) return GetCustomCache(code_out); |
| int index = Heap::code_stubs()->FindEntry(GetKey()); |
| if (index != NumberDictionary::kNotFound) { |
| *code_out = Code::cast(Heap::code_stubs()->ValueAt(index)); |
| @@ -105,17 +104,14 @@ |
| Handle<Code> new_object = Factory::NewCode(desc, flags, masm.CodeObject()); |
| RecordCodeGeneration(*new_object, &masm); |
| - if (has_custom_cache()) { |
| - SetCustomCache(*new_object); |
| - } else { |
| - // Update the dictionary and the root in Heap. |
| - Handle<NumberDictionary> dict = |
| - Factory::DictionaryAtNumberPut( |
| - Handle<NumberDictionary>(Heap::code_stubs()), |
| - GetKey(), |
| - new_object); |
| - Heap::public_set_code_stubs(*dict); |
| - } |
| + // Update the dictionary and the root in Heap. |
| + Handle<NumberDictionary> dict = |
| + Factory::DictionaryAtNumberPut( |
| + Handle<NumberDictionary>(Heap::code_stubs()), |
| + GetKey(), |
| + new_object); |
| + Heap::public_set_code_stubs(*dict); |
| + |
| code = *new_object; |
| } |
| @@ -147,15 +143,11 @@ |
| code = Code::cast(new_object); |
| RecordCodeGeneration(code, &masm); |
| - if (has_custom_cache()) { |
| - SetCustomCache(code); |
| - } else { |
| - // Try to update the code cache but do not fail if unable. |
| - MaybeObject* maybe_new_object = |
| - Heap::code_stubs()->AtNumberPut(GetKey(), code); |
| - if (maybe_new_object->ToObject(&new_object)) { |
| - Heap::public_set_code_stubs(NumberDictionary::cast(new_object)); |
| - } |
| + // Try to update the code cache but do not fail if unable. |
| + MaybeObject* maybe_new_object = |
| + Heap::code_stubs()->AtNumberPut(GetKey(), code); |
|
antonm
2010/11/15 16:22:06
[cosmetic nit] just asking: can this fit one line
SeRya
2010/11/15 16:37:50
It can't (only if shorten the var name).
|
| + if (maybe_new_object->ToObject(&new_object)) { |
| + Heap::public_set_code_stubs(NumberDictionary::cast(new_object)); |
| } |
| } |