| OLD | NEW |
| 1 // Copyright 2006-2009 the V8 project authors. All rights reserved. | 1 // Copyright 2006-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 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1136 | 1136 |
| 1137 #ifdef DEBUG | 1137 #ifdef DEBUG |
| 1138 TraceIC("LoadIC", name, state, target()); | 1138 TraceIC("LoadIC", name, state, target()); |
| 1139 #endif | 1139 #endif |
| 1140 } | 1140 } |
| 1141 | 1141 |
| 1142 | 1142 |
| 1143 MaybeObject* KeyedLoadIC::Load(State state, | 1143 MaybeObject* KeyedLoadIC::Load(State state, |
| 1144 Handle<Object> object, | 1144 Handle<Object> object, |
| 1145 Handle<Object> key) { | 1145 Handle<Object> key) { |
| 1146 // Check for values that can be converted into a symbol. | |
| 1147 // TODO(1295): Remove this code. | |
| 1148 HandleScope scope(isolate()); | |
| 1149 if (key->IsHeapNumber() && | |
| 1150 isnan(HeapNumber::cast(*key)->value())) { | |
| 1151 key = isolate()->factory()->nan_symbol(); | |
| 1152 } else if (key->IsUndefined()) { | |
| 1153 key = isolate()->factory()->undefined_symbol(); | |
| 1154 } | |
| 1155 | |
| 1156 if (key->IsSymbol()) { | 1146 if (key->IsSymbol()) { |
| 1157 Handle<String> name = Handle<String>::cast(key); | 1147 Handle<String> name = Handle<String>::cast(key); |
| 1158 | 1148 |
| 1159 // If the object is undefined or null it's illegal to try to get any | 1149 // If the object is undefined or null it's illegal to try to get any |
| 1160 // of its properties; throw a TypeError in that case. | 1150 // of its properties; throw a TypeError in that case. |
| 1161 if (object->IsUndefined() || object->IsNull()) { | 1151 if (object->IsUndefined() || object->IsNull()) { |
| 1162 return TypeError("non_object_property_load", object, name); | 1152 return TypeError("non_object_property_load", object, name); |
| 1163 } | 1153 } |
| 1164 | 1154 |
| 1165 if (FLAG_use_ic) { | 1155 if (FLAG_use_ic) { |
| (...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2385 #undef ADDR | 2375 #undef ADDR |
| 2386 }; | 2376 }; |
| 2387 | 2377 |
| 2388 | 2378 |
| 2389 Address IC::AddressFromUtilityId(IC::UtilityId id) { | 2379 Address IC::AddressFromUtilityId(IC::UtilityId id) { |
| 2390 return IC_utilities[id]; | 2380 return IC_utilities[id]; |
| 2391 } | 2381 } |
| 2392 | 2382 |
| 2393 | 2383 |
| 2394 } } // namespace v8::internal | 2384 } } // namespace v8::internal |
| OLD | NEW |