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

Side by Side Diff: src/ic.cc

Issue 27516002: Revert "TransitionAndStoreStub bailout needs to transition (and store)." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 2 months 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 | « no previous file | test/mjsunit/allocation-site-info.js » ('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 2239 matching lines...) Expand 10 before | Expand all | Expand 10 after
2250 ic.UpdateState(receiver, key); 2250 ic.UpdateState(receiver, key);
2251 return ic.Store(receiver, key, args.at<Object>(2), MISS_FORCE_GENERIC); 2251 return ic.Store(receiver, key, args.at<Object>(2), MISS_FORCE_GENERIC);
2252 } 2252 }
2253 2253
2254 2254
2255 RUNTIME_FUNCTION(MaybeObject*, ElementsTransitionAndStoreIC_Miss) { 2255 RUNTIME_FUNCTION(MaybeObject*, ElementsTransitionAndStoreIC_Miss) {
2256 HandleScope scope(isolate); 2256 HandleScope scope(isolate);
2257 ASSERT(args.length() == 4); 2257 ASSERT(args.length() == 4);
2258 KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate); 2258 KeyedStoreIC ic(IC::EXTRA_CALL_FRAME, isolate);
2259 Handle<Object> value = args.at<Object>(0); 2259 Handle<Object> value = args.at<Object>(0);
2260 Handle<Map> map = args.at<Map>(1);
2261 Handle<Object> key = args.at<Object>(2); 2260 Handle<Object> key = args.at<Object>(2);
2262 Handle<Object> object = args.at<Object>(3); 2261 Handle<Object> object = args.at<Object>(3);
2263 StrictModeFlag strict_mode = ic.strict_mode(); 2262 StrictModeFlag strict_mode = ic.strict_mode();
2264 if (object->IsJSObject()) {
2265 JSObject::TransitionElementsKind(Handle<JSObject>::cast(object),
2266 map->elements_kind());
2267 }
2268 return Runtime::SetObjectProperty(isolate, 2263 return Runtime::SetObjectProperty(isolate,
2269 object, 2264 object,
2270 key, 2265 key,
2271 value, 2266 value,
2272 NONE, 2267 NONE,
2273 strict_mode); 2268 strict_mode);
2274 } 2269 }
2275 2270
2276 2271
2277 const char* BinaryOpIC::GetName(TypeInfo type_info) { 2272 const char* BinaryOpIC::GetName(TypeInfo type_info) {
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
2718 #undef ADDR 2713 #undef ADDR
2719 }; 2714 };
2720 2715
2721 2716
2722 Address IC::AddressFromUtilityId(IC::UtilityId id) { 2717 Address IC::AddressFromUtilityId(IC::UtilityId id) {
2723 return IC_utilities[id]; 2718 return IC_utilities[id];
2724 } 2719 }
2725 2720
2726 2721
2727 } } // namespace v8::internal 2722 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/allocation-site-info.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698