Fixed bug in while-loops that caused an assertion to fail. ...

src/fast-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 298 matching lines @@
   Label body, exit;
 
   // Emit the test at the bottom of the loop.
   __ bind(&body);
   Visit(stmt->body());
 
   // We are not in an expression context because we have been compiling
   // statements.  Set up a test expression context for the condition.
   ASSERT_EQ(NULL, true_label_);
   ASSERT_EQ(NULL, false_label_);
   true_label_ = &body;

[Lasse Reichstein, 2009/11/10 09:35:34]

We should probably have some scoped object that set and unset/reset both labels.
This seems like unnecessary book-keeping.

[fschneider, 2009/11/10 09:57:18]

Good point.

   false_label_ = &exit;
   ASSERT(stmt->cond()->context() == Expression::kTest);
   Visit(stmt->cond());
+  true_label_ = NULL;
+  false_label_ = NULL;
 
   __ bind(&exit);
 
   decrement_loop_depth();
 }
 
 
 void FastCodeGenerator::VisitWhileStatement(WhileStatement* stmt) {
   Comment cmnt(masm_, "[ WhileStatement");
   increment_loop_depth();
   Label test, body, exit;
 
   // Emit the test at the bottom of the loop.
   __ jmp(&test);
 
   __ bind(&body);
   Visit(stmt->body());
 
   __ bind(&test);
   // We are not in an expression context because we have been compiling
   // statements.  Set up a test expression context for the condition.
   ASSERT_EQ(NULL, true_label_);
   ASSERT_EQ(NULL, false_label_);
   true_label_ = &body;
   false_label_ = &exit;
   ASSERT(stmt->cond()->context() == Expression::kTest);
   Visit(stmt->cond());
+  true_label_ = NULL;
+  false_label_ = NULL;
 
   __ bind(&exit);
 
   decrement_loop_depth();
 }
 
 
 void FastCodeGenerator::VisitForStatement(ForStatement* stmt) {
   Comment cmnt(masm_, "[ ForStatement");
   Label test, body, exit;
@@ skipping 158 matching lines @@
 
 void FastCodeGenerator::VisitThisFunction(ThisFunction* expr) {
   UNREACHABLE();
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal