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

Side by Side Diff: src/ic/ic.cc

Issue 989093002: Do not set target in deoptimized code in keyed store IC. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fix Created 5 years, 9 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
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-460937.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 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #include "src/accessors.h" 7 #include "src/accessors.h"
8 #include "src/api.h" 8 #include "src/api.h"
9 #include "src/arguments.h" 9 #include "src/arguments.h"
10 #include "src/base/bits.h" 10 #include "src/base/bits.h"
(...skipping 2163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2174 2174
2175 DCHECK(!is_target_set()); 2175 DCHECK(!is_target_set());
2176 Code* megamorphic = *megamorphic_stub(); 2176 Code* megamorphic = *megamorphic_stub();
2177 if (*stub == megamorphic) { 2177 if (*stub == megamorphic) {
2178 TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "set generic"); 2178 TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "set generic");
2179 } 2179 }
2180 if (*stub == *slow_stub()) { 2180 if (*stub == *slow_stub()) {
2181 TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "slow stub"); 2181 TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "slow stub");
2182 } 2182 }
2183 DCHECK(!stub.is_null()); 2183 DCHECK(!stub.is_null());
2184 set_target(*stub); 2184 if (!AddressIsDeoptimizedCode()) {
2185 set_target(*stub);
2186 }
2185 TRACE_IC("StoreIC", key); 2187 TRACE_IC("StoreIC", key);
2186 2188
2187 return store_handle; 2189 return store_handle;
2188 } 2190 }
2189 2191
2190 2192
2191 bool CallIC::DoCustomHandler(Handle<Object> function, 2193 bool CallIC::DoCustomHandler(Handle<Object> function,
2192 const CallICState& callic_state) { 2194 const CallICState& callic_state) {
2193 DCHECK(FLAG_use_ic && function->IsJSFunction()); 2195 DCHECK(FLAG_use_ic && function->IsJSFunction());
2194 2196
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
3048 static const Address IC_utilities[] = { 3050 static const Address IC_utilities[] = {
3049 #define ADDR(name) FUNCTION_ADDR(name), 3051 #define ADDR(name) FUNCTION_ADDR(name),
3050 IC_UTIL_LIST(ADDR) NULL 3052 IC_UTIL_LIST(ADDR) NULL
3051 #undef ADDR 3053 #undef ADDR
3052 }; 3054 };
3053 3055
3054 3056
3055 Address IC::AddressFromUtilityId(IC::UtilityId id) { return IC_utilities[id]; } 3057 Address IC::AddressFromUtilityId(IC::UtilityId id) { return IC_utilities[id]; }
3056 } 3058 }
3057 } // namespace v8::internal 3059 } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/regress/regress-460937.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698