Fix a pair of flow graph construction issues.

runtime/vm/intermediate_language.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/object.h"
 #include "vm/os.h"
 #include "vm/scopes.h"
 
 namespace dart {
 
 // ==== Support for visiting flow graphs.
 #define DEFINE_ACCEPT(ShortName, ClassName)                                    \
-  void ClassName::Accept(FlowGraphVisitor* visitor) {                          \
-    visitor->Visit##ShortName(this);                                           \
-  }
+void ClassName::Accept(FlowGraphVisitor* visitor) {                            \
+  visitor->Visit##ShortName(this);                                             \
+}
 
 FOR_EACH_COMPUTATION(DEFINE_ACCEPT)
 
 #undef DEFINE_ACCEPT
 
 
-Instruction* JoinEntryInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitJoinEntry(this);
-  return successor_;
+#define DEFINE_ACCEPT(ShortName)                                               \
+Instruction* ShortName##Instr::Accept(FlowGraphVisitor* visitor) {             \
+  visitor->Visit##ShortName(this);                                             \
+  return StraightLineSuccessor();                                              \
 }
 
+FOR_EACH_INSTRUCTION(DEFINE_ACCEPT)
 
-Instruction* TargetEntryInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitTargetEntry(this);
-  return successor_;
-}
-
-
-Instruction* PickTempInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitPickTemp(this);
-  return successor_;
-}
-
-
-Instruction* TuckTempInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitTuckTemp(this);
-  return successor_;
-}
-
-
-Instruction* DoInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitDo(this);
-  return successor_;
-}
-
-
-Instruction* BindInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitBind(this);
-  return successor_;
-}
-
-
-Instruction* ReturnInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitReturn(this);
-  return NULL;
-}
-
-
-Instruction* ThrowInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitThrow(this);
-  return NULL;
-}
-
-
-Instruction* ReThrowInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitReThrow(this);
-  return NULL;
-}
-
-
-Instruction* BranchInstr::Accept(FlowGraphVisitor* visitor) {
-  visitor->VisitBranch(this);
-  return NULL;
-}
+#undef DEFINE_ACCEPT
 
 
 // Default implementation of visiting basic blocks.  Can be overridden.
 void FlowGraphVisitor::VisitBlocks() {
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     Instruction* current = block_order_[i]->Accept(this);
     while ((current != NULL) && !current->IsBlockEntry()) {
       current = current->Accept(this);
     }
   }
@@ skipping 198 matching lines @@
   // true/false order in reverse postorder used as the block ordering in the
   // nonoptimizing compiler.
   ASSERT(true_successor_ != NULL);
   ASSERT(false_successor_ != NULL);
   false_successor_->DiscoverBlocks(current_block, preorder, postorder, parent);
   true_successor_->DiscoverBlocks(current_block, preorder, postorder, parent);
 }
 
 
 }  // namespace dart