Revision: 5608
Author: [email protected]
Date: Fri Oct 8 06:18:21 2010
Log: Backport r5607 to branches/2.3.
Review URL: http://codereview.chromium.org/3539019
http://code.google.com/p/v8/source/detail?r=5608
Modified:
/branches/2.3/src/full-codegen.cc
/branches/2.3/src/version.cc
=======================================
--- /branches/2.3/src/full-codegen.cc Wed Aug 25 08:26:24 2010
+++ /branches/2.3/src/full-codegen.cc Fri Oct 8 06:18:21 2010
@@ -1014,10 +1014,11 @@
__ bind(&true_case);
SetExpressionPosition(expr->then_expression(),
expr->then_expression_position());
- Visit(expr->then_expression());
- // If control flow falls through Visit, jump to done.
if (context_ == Expression::kEffect || context_ == Expression::kValue) {
+ Visit(expr->then_expression());
__ jmp(&done);
+ } else {
+ VisitForControl(expr->then_expression(), true_label_, false_label_,
NULL);
}
__ bind(&false_case);
=======================================
--- /branches/2.3/src/version.cc Wed Sep 29 09:05:05 2010
+++ /branches/2.3/src/version.cc Fri Oct 8 06:18:21 2010
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 3
#define BUILD_NUMBER 11
-#define PATCH_LEVEL 16
+#define PATCH_LEVEL 17
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
