Reviewers: Mads Ager,

Description:
Merge r7408 from bleeding edge.

BUG=77654

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

SVN Base: http://v8.googlecode.com/svn/trunk/

Affected files:
  M     src/ia32/lithium-ia32.cc
  M     src/version.cc


Index: src/ia32/lithium-ia32.cc
===================================================================
--- src/ia32/lithium-ia32.cc    (revision 7408)
+++ src/ia32/lithium-ia32.cc    (working copy)
@@ -1635,7 +1635,7 @@
       if (needs_check) {
         CpuFeatures* cpu_features = Isolate::Current()->cpu_features();
         LOperand* xmm_temp =
- (instr->CanTruncateToInt32() && !cpu_features->IsSupported(SSE3)) + (instr->CanTruncateToInt32() && cpu_features->IsSupported(SSE3))
             ? NULL
             : FixedTemp(xmm1);
         LTaggedToI* res = new LTaggedToI(value, xmm_temp);
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 7408)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     2
 #define BUILD_NUMBER      5
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1

 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)


--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev

Reply via email to