Revision: 7410
Author:   fschnei...@chromium.org
Date:     Tue Mar 29 04:00:56 2011
Log:      Merge r7408 from bleeding edge.

BUG=77654
Review URL: http://codereview.chromium.org/6708103
http://code.google.com/p/v8/source/detail?r=7410

Modified:
 /trunk/src/ia32/lithium-ia32.cc
 /trunk/src/version.cc

=======================================
--- /trunk/src/ia32/lithium-ia32.cc     Mon Mar 28 03:47:03 2011
+++ /trunk/src/ia32/lithium-ia32.cc     Tue Mar 29 04:00:56 2011
@@ -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);
=======================================
--- /trunk/src/version.cc       Mon Mar 28 03:47:03 2011
+++ /trunk/src/version.cc       Tue Mar 29 04:00:56 2011
@@ -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