Backport r5607 to branches/2.3.

src/full-codegen.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 996 matching lines @@
 
 
 void FullCodeGenerator::VisitConditional(Conditional* expr) {
   Comment cmnt(masm_, "[ Conditional");
   Label true_case, false_case, done;
   VisitForControl(expr->condition(), &true_case, &false_case, &true_case);
 
   __ 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);
   SetExpressionPosition(expr->else_expression(),
                         expr->else_expression_position());
   Visit(expr->else_expression());
   // If control flow falls through Visit, merge it with true case here.
   if (context_ == Expression::kEffect || context_ == Expression::kValue) {
     __ bind(&done);
   }
@@ skipping 76 matching lines @@
   ASSERT(args->length() == 1);
   VisitForValue(args->at(0), kStack);
   __ CallRuntime(Runtime::kRegExpCloneResult, 1);
   Apply(context_, result_register());
 }
 
 #undef __
 
 
 } }  // namespace v8::internal