First step of refactoring expression contexts in the toplevel code...

src/fast-codegen.h

 // 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 232 matching lines @@
   void DoTest(Expression::Context context);
 
   void Move(Slot* dst, Register source, Register scratch1, Register scratch2);
   void Move(Register dst, Slot* source);
 
   // Return an operand used to read/write to a known (ie, non-LOOKUP) slot.
   // May emit code to traverse the context chain, destroying the scratch
   // register.
   MemOperand EmitSlotSearch(Slot* slot, Register scratch);
 
+  void VisitForEffect(Expression* expr) {
+    Expression::Context saved_context = context_;
+    context_ = Expression::kEffect;
+    Visit(expr);
+    context_ = saved_context;
+  }
+
   void VisitForValue(Expression* expr, Location where) {
-    ASSERT(expr->context() == Expression::kValue);
+    Expression::Context saved_context = context_;
     Location saved_location = location_;
+    context_ = Expression::kValue;
     location_ = where;
     Visit(expr);
+    context_ = saved_context;
     location_ = saved_location;
   }
 
   void VisitForControl(Expression* expr, Label* if_true, Label* if_false) {
-    ASSERT(expr->context() == Expression::kTest ||
-           expr->context() == Expression::kValueTest ||
-           expr->context() == Expression::kTestValue);
+    Expression::Context saved_context = context_;
     Label* saved_true = true_label_;
     Label* saved_false = false_label_;
+    context_ = Expression::kTest;
     true_label_ = if_true;
     false_label_ = if_false;
     Visit(expr);
+    context_ = saved_context;
+    true_label_ = saved_true;
+    false_label_ = saved_false;
+  }
+
+  void VisitForValueControl(Expression* expr,
+                            Location where,
+                            Label* if_true,
+                            Label* if_false) {
+    Expression::Context saved_context = context_;
+    Location saved_location = location_;
+    Label* saved_true = true_label_;
+    Label* saved_false = false_label_;
+    context_ = Expression::kValueTest;
+    location_ = where;
+    true_label_ = if_true;
+    false_label_ = if_false;
+    Visit(expr);
+    context_ = saved_context;
+    location_ = saved_location;
+    true_label_ = saved_true;
+    false_label_ = saved_false;
+  }
+
+  void VisitForControlValue(Expression* expr,
+                            Location where,
+                            Label* if_true,
+                            Label* if_false) {
+    Expression::Context saved_context = context_;
+    Location saved_location = location_;
+    Label* saved_true = true_label_;
+    Label* saved_false = false_label_;
+    context_ = Expression::kTestValue;
+    location_ = where;
+    true_label_ = if_true;
+    false_label_ = if_false;
+    Visit(expr);
+    context_ = saved_context;
+    location_ = saved_location;
     true_label_ = saved_true;
     false_label_ = saved_false;
   }
 
   void VisitDeclarations(ZoneList<Declaration*>* declarations);
   void DeclareGlobals(Handle<FixedArray> pairs);
 
   // Platform-specific return sequence
   void EmitReturnSequence(int position);
 
@@ skipping 69 matching lines @@
   void EmitLogicalOperation(BinaryOperation* expr);
 
   MacroAssembler* masm_;
   FunctionLiteral* function_;
   Handle<Script> script_;
   bool is_eval_;
   Label return_label_;
   NestedStatement* nesting_stack_;
   int loop_depth_;
 
+  Expression::Context context_;
   Location location_;
   Label* true_label_;
   Label* false_label_;
 
   friend class NestedStatement;
 
   DISALLOW_COPY_AND_ASSIGN(FastCodeGenerator);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FAST_CODEGEN_H_