Remove strictmode from FindHandler.
authorverwaest@chromium.org <verwaest@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 28 Nov 2013 18:13:30 +0000 (18:13 +0000)
committerverwaest@chromium.org <verwaest@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 28 Nov 2013 18:13:30 +0000 (18:13 +0000)
R=mvstanton@chromium.org

Review URL: https://chromiumcodereview.appspot.com/95433002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18141 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/ic.cc
src/stub-cache.cc
src/stub-cache.h

index 9f55bd8..46820fe 100644 (file)
--- a/src/ic.cc
+++ b/src/ic.cc
@@ -1178,12 +1178,8 @@ Handle<Code> IC::ComputeHandler(LookupResult* lookup,
   Handle<HeapObject> stub_holder(GetCodeCacheHolder(
       isolate(), *object, cache_holder));
 
-  StrictModeFlag strict_mode = kNonStrictMode;
-  if (kind() == Code::STORE_IC || kind() == Code::KEYED_STORE_IC) {
-    strict_mode = StoreIC::GetStrictMode(extra_ic_state());
-  }
   Handle<Code> code = isolate()->stub_cache()->FindHandler(
-      name, handle(stub_holder->map()), kind(), cache_holder, strict_mode);
+      name, handle(stub_holder->map()), kind(), cache_holder);
   if (!code.is_null()) return code;
 
   code = CompileHandler(lookup, object, name, value, cache_holder);
index 3174f4b..cb68b89 100644 (file)
@@ -115,17 +115,9 @@ Handle<Code> StubCache::FindIC(Handle<Name> name,
 Handle<Code> StubCache::FindHandler(Handle<Name> name,
                                     Handle<Map> stub_holder,
                                     Code::Kind kind,
-                                    InlineCacheHolderFlag cache_holder,
-                                    StrictModeFlag strict_mode) {
-  ExtraICState extra_ic_state = kNoExtraICState;
-  if (kind == Code::STORE_IC) {
-    extra_ic_state = StoreIC::ComputeExtraICState(strict_mode);
-  } else if (kind == Code::KEYED_STORE_IC) {
-    extra_ic_state = KeyedStoreIC::ComputeExtraICState(strict_mode,
-                                                       STANDARD_STORE);
-  }
+                                    InlineCacheHolderFlag cache_holder) {
   Code::Flags flags = Code::ComputeMonomorphicFlags(
-      Code::HANDLER, extra_ic_state, cache_holder, Code::NORMAL, kind);
+      Code::HANDLER, kNoExtraICState, cache_holder, Code::NORMAL, kind);
 
   Handle<Object> probe(stub_holder->FindInCodeCache(*name, flags), isolate_);
   if (probe->IsCode()) return Handle<Code>::cast(probe);
index 7352e28..c70b1ff 100644 (file)
@@ -89,8 +89,7 @@ class StubCache {
   Handle<Code> FindHandler(Handle<Name> name,
                            Handle<Map> map,
                            Code::Kind kind,
-                           InlineCacheHolderFlag cache_holder = OWN_MAP,
-                           StrictModeFlag strict_mode = kNonStrictMode);
+                           InlineCacheHolderFlag cache_holder = OWN_MAP);
 
   Handle<Code> ComputeMonomorphicIC(Handle<Name> name,
                                     Handle<Type> type,