Changeset 55002 in webkit for trunk/JavaScriptCore/jit/JITStubs.cpp
- Timestamp:
- Feb 18, 2010, 10:23:25 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/jit/JITStubs.cpp
r54843 r55002 857 857 858 858 // Uncacheable: give up. 859 if (!slot.isCacheable ()) {859 if (!slot.isCacheableValue()) { 860 860 ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(cti_op_get_by_id_generic)); 861 861 return; 862 862 } 863 ASSERT(!slot.isGetter()); 863 864 864 865 JSCell* baseCell = asCell(baseValue); … … 1290 1291 // be an object. (Assertion to ensure asObject() call below is safe, which comes after 1291 1292 // an isCacheable() chceck. 1292 ASSERT(!slot.isCacheable () || slot.slotBase().isObject());1293 ASSERT(!slot.isCacheableValue() || slot.slotBase().isObject()); 1293 1294 1294 1295 // Check that: … … 1301 1302 JSObject* slotBaseObject; 1302 1303 if (baseValue.isCell() 1303 && slot.isCacheable ()1304 && slot.isCacheableValue() 1304 1305 && !(structure = asCell(baseValue)->structure())->isUncacheableDictionary() 1305 1306 && (slotBaseObject = asObject(slot.slotBase()))->getPropertySpecificValue(callFrame, ident, specific) … … 1375 1376 1376 1377 if (baseValue.isCell() 1377 && slot.isCacheable ()1378 && slot.isCacheableValue() 1378 1379 && !asCell(baseValue)->structure()->isUncacheableDictionary() 1379 1380 && slot.slotBase() == baseValue) { … … 1448 1449 CHECK_FOR_EXCEPTION(); 1449 1450 1450 if (!baseValue.isCell() || !slot.isCacheable () || asCell(baseValue)->structure()->isDictionary()) {1451 if (!baseValue.isCell() || !slot.isCacheableValue() || asCell(baseValue)->structure()->isDictionary()) { 1451 1452 ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); 1452 1453 return JSValue::encode(result); … … 2304 2305 if (globalObject->getPropertySlot(callFrame, ident, slot)) { 2305 2306 JSValue result = slot.getValue(callFrame, ident); 2306 if (slot.isCacheable () && !globalObject->structure()->isUncacheableDictionary() && slot.slotBase() == globalObject) {2307 if (slot.isCacheableValue() && !globalObject->structure()->isUncacheableDictionary() && slot.slotBase() == globalObject) { 2307 2308 GlobalResolveInfo& globalResolveInfo = callFrame->codeBlock()->globalResolveInfo(globalResolveInfoIndex); 2308 2309 if (globalResolveInfo.structure)
Note:
See TracChangeset
for help on using the changeset viewer.