Revision: 16567
Author:   [email protected]
Date:     Fri Sep  6 11:12:30 2013 UTC
Log:      Merged r16566 into trunk branch.

Fix polymorphic INTERCEPTOR StoreICs on ARM/MIPS

BUG=chromium:284998
[email protected]

Review URL: https://codereview.chromium.org/23818004
http://code.google.com/p/v8/source/detail?r=16567

Modified:
 /trunk/src/arm/stub-cache-arm.cc
 /trunk/src/mips/stub-cache-mips.cc
 /trunk/src/version.cc

=======================================
--- /trunk/src/arm/stub-cache-arm.cc    Thu Sep  5 16:31:13 2013 UTC
+++ /trunk/src/arm/stub-cache-arm.cc    Fri Sep  6 11:12:30 2013 UTC
@@ -2872,7 +2872,7 @@
   TailCallBuiltin(masm(), MissBuiltin(kind()));

   // Return the generated code.
-  return GetICCode(kind(), Code::INTERCEPTOR, name);
+  return GetCode(kind(), Code::INTERCEPTOR, name);
 }


=======================================
--- /trunk/src/mips/stub-cache-mips.cc  Thu Sep  5 16:31:13 2013 UTC
+++ /trunk/src/mips/stub-cache-mips.cc  Fri Sep  6 11:12:30 2013 UTC
@@ -2894,7 +2894,7 @@
   TailCallBuiltin(masm(), MissBuiltin(kind()));

   // Return the generated code.
-  return GetICCode(kind(), Code::INTERCEPTOR, name);
+  return GetCode(kind(), Code::INTERCEPTOR, name);
 }


=======================================
--- /trunk/src/version.cc       Thu Sep  5 16:31:13 2013 UTC
+++ /trunk/src/version.cc       Fri Sep  6 11:12:30 2013 UTC
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     21
 #define BUILD_NUMBER      11
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0

--
--
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