Revision: 16859
Author:   [email protected]
Date:     Fri Sep 20 11:22:23 2013 UTC
Log:      Remove duplicate way of encoding the holder in the flags.

[email protected]

Review URL: https://chromiumcodereview.appspot.com/24316002
http://code.google.com/p/v8/source/detail?r=16859

Modified:
 /branches/bleeding_edge/src/objects.h
 /branches/bleeding_edge/src/stub-cache.cc

=======================================
--- /branches/bleeding_edge/src/objects.h       Thu Sep 19 21:26:01 2013 UTC
+++ /branches/bleeding_edge/src/objects.h       Fri Sep 20 11:22:23 2013 UTC
@@ -4813,11 +4813,6 @@
     NONEXISTENT
   };

-  enum StubHolder {
-    OWN_STUB,
-    PROTOTYPE_STUB
-  };
-
   typedef int ExtraICState;

   static const ExtraICState kNoExtraICState = 0;
@@ -5022,8 +5017,6 @@
   class ExtraICStateKeyedAccessStoreMode:
       public BitField<KeyedAccessStoreMode, 1, 4> {};  // NOLINT

-  class ExtraICStateStubHolder: public BitField<StubHolder, 0, 1> {};
-
   static inline StrictModeFlag GetStrictMode(ExtraICState extra_ic_state) {
     return ExtraICStateStrictMode::decode(extra_ic_state);
   }
@@ -5039,10 +5032,6 @@
     return ExtraICStateKeyedAccessStoreMode::encode(store_mode) |
         ExtraICStateStrictMode::encode(strict_mode);
   }
-
-  static inline ExtraICState ComputeExtraICState(StubHolder stub_holder) {
-    return ExtraICStateStubHolder::encode(stub_holder);
-  }

   // Flags operations.
   static inline Flags ComputeFlags(
=======================================
--- /branches/bleeding_edge/src/stub-cache.cc   Tue Sep 17 11:01:43 2013 UTC
+++ /branches/bleeding_edge/src/stub-cache.cc   Fri Sep 20 11:22:23 2013 UTC
@@ -136,12 +136,11 @@
                                         Handle<JSObject> stub_holder,
                                         Code::Kind kind,
                                         Code::StubType type) {
-  Code::ExtraICState extra_ic_state = Code::ComputeExtraICState(
-      receiver.is_identical_to(stub_holder) ? Code::OWN_STUB
-                                            : Code::PROTOTYPE_STUB);
+  InlineCacheHolderFlag holder_flag = receiver.is_identical_to(stub_holder)
+      ? OWN_MAP : PROTOTYPE_MAP;
   ASSERT(type != Code::NORMAL);
   Code::Flags flags = Code::ComputeMonomorphicFlags(
-      Code::STUB, extra_ic_state, type, kind);
+      Code::STUB, Code::kNoExtraICState, type, kind, holder_flag);
   Handle<Object> probe(stub_holder->map()->FindInCodeCache(*name, flags),
                        isolate_);
   if (probe->IsCode()) return Handle<Code>::cast(probe);

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to