Revision: 23444
Author:   [email protected]
Date:     Wed Aug 27 10:00:06 2014 UTC
Log:      Minor-key-ify BinaryOpICWithAllocationSiteStub.

[email protected]

Review URL: https://codereview.chromium.org/506003002
https://code.google.com/p/v8/source/detail?r=23444

Modified:
 /branches/bleeding_edge/src/arm/code-stubs-arm.cc
 /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc
 /branches/bleeding_edge/src/code-stubs.cc
 /branches/bleeding_edge/src/code-stubs.h
 /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
 /branches/bleeding_edge/src/x64/code-stubs-x64.cc

=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Tue Aug 26 14:56:35 2014 UTC +++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Wed Aug 27 10:00:06 2014 UTC
@@ -3723,7 +3723,7 @@

   // Tail call into the stub that handles binary operations with allocation
   // sites.
-  BinaryOpWithAllocationSiteStub stub(isolate(), state_);
+  BinaryOpWithAllocationSiteStub stub(isolate(), state());
   __ TailCallStub(&stub);
 }

=======================================
--- /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Tue Aug 26 14:56:35 2014 UTC +++ /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Wed Aug 27 10:00:06 2014 UTC
@@ -4332,7 +4332,7 @@

   // Tail call into the stub that handles binary operations with allocation
   // sites.
-  BinaryOpWithAllocationSiteStub stub(isolate(), state_);
+  BinaryOpWithAllocationSiteStub stub(isolate(), state());
   __ TailCallStub(&stub);
 }

=======================================
--- /branches/bleeding_edge/src/code-stubs.cc   Tue Aug 26 16:32:51 2014 UTC
+++ /branches/bleeding_edge/src/code-stubs.cc   Wed Aug 27 10:00:06 2014 UTC
@@ -291,7 +291,7 @@

 void BinaryOpICWithAllocationSiteStub::PrintState(
     OStream& os) const {  // NOLINT
-  os << state_;
+  os << state();
 }


=======================================
--- /branches/bleeding_edge/src/code-stubs.h    Tue Aug 26 16:32:51 2014 UTC
+++ /branches/bleeding_edge/src/code-stubs.h    Wed Aug 27 10:00:06 2014 UTC
@@ -1201,7 +1201,7 @@
  public:
   BinaryOpICWithAllocationSiteStub(Isolate* isolate,
                                    const BinaryOpIC::State& state)
-      : PlatformCodeStub(isolate), state_(state) {
+      : PlatformCodeStub(isolate) {
     minor_key_ = state.GetExtraICState();
   }

@@ -1218,11 +1218,11 @@
   }

   virtual InlineCacheState GetICState() const V8_OVERRIDE {
-    return state_.GetICState();
+    return state().GetICState();
   }

   virtual ExtraICState GetExtraICState() const V8_OVERRIDE {
-    return state_.GetExtraICState();
+    return static_cast<ExtraICState>(minor_key_);
   }

   virtual void Generate(MacroAssembler* masm) V8_OVERRIDE;
@@ -1232,14 +1232,15 @@
   virtual Major MajorKey() const V8_OVERRIDE {
     return BinaryOpICWithAllocationSite;
   }
- virtual uint32_t MinorKey() const V8_OVERRIDE { return GetExtraICState(); }

  private:
+  BinaryOpIC::State state() const {
+ return BinaryOpIC::State(isolate(), static_cast<ExtraICState>(minor_key_));
+  }
+
   static void GenerateAheadOfTime(Isolate* isolate,
                                   const BinaryOpIC::State& state);

-  BinaryOpIC::State state_;
-
   DISALLOW_COPY_AND_ASSIGN(BinaryOpICWithAllocationSiteStub);
 };

=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Tue Aug 26 14:56:35 2014 UTC +++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Wed Aug 27 10:00:06 2014 UTC
@@ -3626,7 +3626,7 @@

   // Tail call into the stub that handles binary operations with allocation
   // sites.
-  BinaryOpWithAllocationSiteStub stub(isolate(), state_);
+  BinaryOpWithAllocationSiteStub stub(isolate(), state());
   __ TailCallStub(&stub);
 }

=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Tue Aug 26 14:56:35 2014 UTC +++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Wed Aug 27 10:00:06 2014 UTC
@@ -3593,7 +3593,7 @@

   // Tail call into the stub that handles binary operations with allocation
   // sites.
-  BinaryOpWithAllocationSiteStub stub(isolate(), state_);
+  BinaryOpWithAllocationSiteStub stub(isolate(), state());
   __ TailCallStub(&stub);
 }

--
--
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/d/optout.

Reply via email to