Added support for expression statements to the CFG builder and...

src/cfg.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 406 matching lines @@
 EXPRESSION_NODE_LIST(DEFINE_VISIT)
 #undef DEFINE_VISIT
 
 
 void StatementBuilder::VisitBlock(Block* stmt) {
   VisitStatements(stmt->statements());
 }
 
 
 void StatementBuilder::VisitExpressionStatement(ExpressionStatement* stmt) {
-  BAILOUT("ExpressionStatement");
+  ExpressionBuilder builder;
+  builder.Build(stmt->expression());
+  if (builder.cfg() == NULL) {
+    BAILOUT("unsupported expression in expression statement");
+  }
+  // Here's a temporary hack: we bang on the last instruction of the
+  // expression (if any) to set its location to Effect.
+  if (!builder.cfg()->is_empty()) {
+    InstructionBlock* block = InstructionBlock::cast(builder.cfg()->exit());
+    Instruction* instr = block->instructions()->last();
+    instr->set_location(CfgGlobals::current()->effect_location());
+  }
+  cfg_->Concatenate(builder.cfg());

[Lasse Reichstein, 2009/08/06 07:42:33]

Call it graph_ or flow_graph_ or even control_flow_graph_.

 }
 
 
 void StatementBuilder::VisitEmptyStatement(EmptyStatement* stmt) {
   // Nothing to do.
 }
 
 
 void StatementBuilder::VisitIfStatement(IfStatement* stmt) {
   BAILOUT("IfStatement");
@@ skipping 145 matching lines @@
 void ExitNode::Print() {
   if (!is_marked_) {
     is_marked_ = true;
     PrintF("L%d:\nExit\n\n", number());
   }
 }
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal