Cleanups.

runtime/vm/intrinsifier.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.
 // Class for intrinsifying functions.
 
 #include "vm/assembler.h"
 #include "vm/intrinsifier.h"
 #include "vm/flags.h"
 #include "vm/object.h"
 #include "vm/symbols.h"
@@ skipping 120 matching lines @@
                            *ic_data_array,
                            NULL,  // NULL = not inlining.
                            Isolate::kNoDeoptId);  // No OSR id.
 
   intptr_t block_id = builder.AllocateBlockId();
   TargetEntryInstr* normal_entry =
       new TargetEntryInstr(block_id,
                            CatchClauseNode::kInvalidTryIndex);
   GraphEntryInstr* graph_entry = new GraphEntryInstr(
       parsed_function, normal_entry, Isolate::kNoDeoptId);  // No OSR id.
-  FlowGraph* graph = new FlowGraph(builder, graph_entry, block_id);
+  FlowGraph* graph = new FlowGraph(parsed_function, graph_entry, block_id);
   const Function& function = parsed_function->function();
   switch (function.recognized_kind()) {
 #define EMIT_CASE(test_class_name, test_function_name, enum_name, fp)          \
     case MethodRecognizer::k##enum_name:                                       \
       ASSERT(function.CheckSourceFingerprint(fp));                             \
       if (!Build_##enum_name(graph)) return false;                             \
       break;
 
     GRAPH_INTRINSICS_LIST(EMIT_CASE);
     default:
@@ skipping 91 matching lines @@
 
   Definition* AddParameter(intptr_t index) {
     intptr_t adjustment = Intrinsifier::ParameterSlotFromSp();
     return AddToInitialDefinitions(
       new ParameterInstr(adjustment + index,
                          flow_graph_->graph_entry(),
                          SPREG));
   }
 
   intptr_t TokenPos() {
-    return flow_graph_->parsed_function().function().token_pos();
+    return flow_graph_->parsed_function()->function().token_pos();
   }
 
  private:
   FlowGraph* flow_graph_;
   BlockEntryInstr* entry_;
   Instruction* current_;
 };
 
 
 static void PrepareIndexedOp(BlockBuilder* builder,
@@ skipping 167 matching lines @@
   TargetEntryInstr* normal_entry = graph_entry->normal_entry();
   BlockBuilder builder(flow_graph, normal_entry);
 
   Definition* value = builder.AddParameter(1);
   Definition* index = builder.AddParameter(2);
   Definition* array = builder.AddParameter(3);
 
   PrepareIndexedOp(&builder, array, index, TypedData::length_offset());
 
   const ICData& value_check = ICData::ZoneHandle(ICData::New(
-      flow_graph->parsed_function().function(),
-      String::Handle(flow_graph->parsed_function().function().name()),
+      flow_graph->parsed_function()->function(),
+      String::Handle(flow_graph->parsed_function()->function().name()),
       Object::empty_array(),  // Dummy args. descr.
       Isolate::kNoDeoptId,
       1));
   value_check.AddReceiverCheck(kDoubleCid,
-                               flow_graph->parsed_function().function());
+                               flow_graph->parsed_function()->function());
   builder.AddInstruction(
       new CheckClassInstr(new Value(value),
                           Isolate::kNoDeoptId,
                           value_check,
                           builder.TokenPos()));
   Definition* double_value = builder.AddDefinition(
       UnboxInstr::Create(kUnboxedDouble,
                          new Value(value),
                          Isolate::kNoDeoptId));
   // Manually adjust reaching type because there is no type propagation
@@ skipping 102 matching lines @@
       new LoadFieldInstr(new Value(backing_store),
                          Array::length_offset(),
                          Type::ZoneHandle(),
                          builder.TokenPos()));
   builder.AddIntrinsicReturn(new Value(capacity));
   return true;
 }
 
 
 }  // namespace dart