| OLD | NEW |
| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 return KeyedStoreIC::GetKeyedAccessStoreMode(code->extra_ic_state()); | 147 return KeyedStoreIC::GetKeyedAccessStoreMode(code->extra_ic_state()); |
| 148 } | 148 } |
| 149 } | 149 } |
| 150 return STANDARD_STORE; | 150 return STANDARD_STORE; |
| 151 } | 151 } |
| 152 | 152 |
| 153 | 153 |
| 154 Handle<JSFunction> TypeFeedbackOracle::GetCallTarget(int slot) { | 154 Handle<JSFunction> TypeFeedbackOracle::GetCallTarget(int slot) { |
| 155 Handle<Object> info = GetInfo(slot); | 155 Handle<Object> info = GetInfo(slot); |
| 156 if (info->IsAllocationSite()) { | 156 if (info->IsAllocationSite()) { |
| 157 return Handle<JSFunction>(isolate()->global_context()->array_function()); | 157 return Handle<JSFunction>(isolate()->native_context()->array_function()); |
| 158 } else { | 158 } else { |
| 159 return Handle<JSFunction>::cast(info); | 159 return Handle<JSFunction>::cast(info); |
| 160 } | 160 } |
| 161 } | 161 } |
| 162 | 162 |
| 163 | 163 |
| 164 Handle<JSFunction> TypeFeedbackOracle::GetCallNewTarget(int slot) { | 164 Handle<JSFunction> TypeFeedbackOracle::GetCallNewTarget(int slot) { |
| 165 Handle<Object> info = GetInfo(slot); | 165 Handle<Object> info = GetInfo(slot); |
| 166 if (info->IsAllocationSite()) { | 166 if (info->IsAllocationSite()) { |
| 167 return Handle<JSFunction>(isolate()->global_context()->array_function()); | 167 return Handle<JSFunction>(isolate()->native_context()->array_function()); |
| 168 } else { | 168 } else { |
| 169 return Handle<JSFunction>::cast(info); | 169 return Handle<JSFunction>::cast(info); |
| 170 } | 170 } |
| 171 } | 171 } |
| 172 | 172 |
| 173 | 173 |
| 174 Handle<AllocationSite> TypeFeedbackOracle::GetCallNewAllocationSite(int slot) { | 174 Handle<AllocationSite> TypeFeedbackOracle::GetCallNewAllocationSite(int slot) { |
| 175 Handle<Object> info = GetInfo(slot); | 175 Handle<Object> info = GetInfo(slot); |
| 176 if (info->IsAllocationSite()) { | 176 if (info->IsAllocationSite()) { |
| 177 return Handle<AllocationSite>::cast(info); | 177 return Handle<AllocationSite>::cast(info); |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 #ifdef DEBUG | 490 #ifdef DEBUG |
| 491 Object* result = NULL; | 491 Object* result = NULL; |
| 492 // Dictionary has been allocated with sufficient size for all elements. | 492 // Dictionary has been allocated with sufficient size for all elements. |
| 493 ASSERT(maybe_result->ToObject(&result)); | 493 ASSERT(maybe_result->ToObject(&result)); |
| 494 ASSERT(*dictionary_ == result); | 494 ASSERT(*dictionary_ == result); |
| 495 #endif | 495 #endif |
| 496 } | 496 } |
| 497 | 497 |
| 498 | 498 |
| 499 } } // namespace v8::internal | 499 } } // namespace v8::internal |
| OLD | NEW |