Minor simplification and cleanup of graph builder.

src/compiler/graph-builder.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/graph-builder.h"
 
 #include "src/compiler.h"
 #include "src/compiler/generic-graph.h"
 #include "src/compiler/generic-node.h"
 #include "src/compiler/generic-node-inl.h"
@@ skipping 38 matching lines @@
     Node** buffer = reinterpret_cast<Node**>(raw_buffer);
     memcpy(buffer, value_inputs, kPointerSize * value_input_count);
     Node** current_input = buffer + value_input_count;
     if (has_context) {
       *current_input++ = current_context();
     }
     if (has_effect) {
       *current_input++ = environment_->GetEffectDependency();
     }
     if (has_control) {
-      *current_input++ = GetControlDependency();
+      *current_input++ = environment_->GetControlDependency();
     }
     result = graph()->NewNode(op, input_count_with_deps, buffer);
     if (has_effect) {
       environment_->UpdateEffectDependency(result);
     }
     if (NodeProperties::HasControlOutput(result) &&
-        !environment_internal()->IsMarkedAsUnreachable()) {
-      UpdateControlDependency(result);
+        !environment()->IsMarkedAsUnreachable()) {
+      environment_->UpdateControlDependency(result);
     }
   }
 
   return result;
 }
 
 
-Node* StructuredGraphBuilder::GetControlDependency() {
-  return environment_->GetControlDependency();
-}
-
-
-void StructuredGraphBuilder::UpdateControlDependency(Node* new_control) {
-  environment_->UpdateControlDependency(new_control);
-}
-
-
 void StructuredGraphBuilder::UpdateControlDependencyToLeaveFunction(
     Node* exit) {
-  if (environment_internal()->IsMarkedAsUnreachable()) return;
+  if (environment()->IsMarkedAsUnreachable()) return;
   if (exit_control() != NULL) {
     exit = MergeControl(exit_control(), exit);
   }
-  environment_internal()->MarkAsUnreachable();
+  environment()->MarkAsUnreachable();
   set_exit_control(exit);
 }
 
 
 StructuredGraphBuilder::Environment* StructuredGraphBuilder::CopyEnvironment(
     Environment* env) {
   return new (zone()) Environment(*env);
 }
 
 
@@ skipping 140 matching lines @@
   if (!dead_control_.is_set()) {
     Node* dead_node = graph()->NewNode(common_->Dead());
     dead_control_.set(dead_node);
     return dead_node;
   }
   return dead_control_.get();
 }
 }
 }
 }  // namespace v8::internal::compiler