Reviewers: danno,

Description:
Fix arm compilation failure on the 3.2 branch after merge of r8623 from bleeding
edge.

We changed the name of Code::TYPE_RECORDING_BINARY_OP_IC to Code::BINARY_OP_IC
between the 3.2 and 3.3 branch.

Please review this at http://codereview.chromium.org/7359013/

SVN Base: http://v8.googlecode.com/svn/branches/3.2/

Affected files:
  M     src/arm/lithium-codegen-arm.cc
  M     src/version.cc


Index: src/arm/lithium-codegen-arm.cc
===================================================================
--- src/arm/lithium-codegen-arm.cc      (revision 8647)
+++ src/arm/lithium-codegen-arm.cc      (working copy)
@@ -500,7 +500,7 @@

   // Signal that we don't inline smi code before these stubs in the
   // optimizing code generator.
-  if (code->kind() == Code::BINARY_OP_IC ||
+  if (code->kind() == Code::TYPE_RECORDING_BINARY_OP_IC ||
       code->kind() == Code::COMPARE_IC) {
     __ nop();
   }
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 8647)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     2
 #define BUILD_NUMBER      10
-#define PATCH_LEVEL       29
+#define PATCH_LEVEL       30
 // 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

Reply via email to