Intrinsify methods early. Fix some bugs in trinsified code, mark one precision-related bug as SKIP …

runtime/vm/opt_code_generator_ia32.cc

 // Copyright (c) 2011, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/opt_code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast_printer.h"
-#include "vm/intrinsifier.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 #define __ assembler_->
 
 DEFINE_FLAG(bool, trace_optimization, false, "Trace optimizations.");
 DECLARE_FLAG(bool, enable_type_checks);
-DECLARE_FLAG(bool, intrinsify);
-DECLARE_FLAG(bool, trace_functions);
 
 
 // Property list to be used in CodeGenInfo. Each property has a setter
 // and a getter of specified type and name.
 // (name, type, default)
 #define PROPERTY_LIST(V)                                                       \
   V(is_temp, bool, false)                                                      \
   V(allow_temp, bool, false)                                                   \
   V(true_label, Label*, NULL)                                                  \
   V(false_label, Label*, NULL)                                                 \
@@ skipping 326 matching lines @@
 
 void OptimizingCodeGenerator::TraceNotOpt(AstNode* node, const char* message) {
   if (FLAG_trace_optimization) {
     OS::Print("NOTOpt node ix: %d; %s: ", node->token_index(), message);
     AstPrinter::PrintNode(node);
     OS::Print("\n");
   }
 }
 
 
-void OptimizingCodeGenerator::IntrinsifyGetter() {
-  // TOS: return address.
-  // +1 : receiver.
-  // Sequence node has one return node, its input is oad field node.
-  const SequenceNode& sequence_node = *parsed_function_.node_sequence();
-  ASSERT(sequence_node.length() == 1);
-  ASSERT(sequence_node.NodeAt(0)->IsReturnNode());
-  const ReturnNode& return_node = *sequence_node.NodeAt(0)->AsReturnNode();
-  ASSERT(return_node.value()->IsLoadInstanceFieldNode());
-  const LoadInstanceFieldNode& load_node =
-      *return_node.value()->AsLoadInstanceFieldNode();
-  __ movl(EAX, Address(ESP, 1 * kWordSize));
-  __ movl(EAX, FieldAddress(EAX, load_node.field().Offset()));
-  __ ret();
-}
-
-
-void OptimizingCodeGenerator::IntrinsifySetter() {
-  // TOS: return address.
-  // +1 : value
-  // +2 : receiver.
-  // Sequence node has one store node and one return NULL node.
-  const SequenceNode& sequence_node = *parsed_function_.node_sequence();
-  ASSERT(sequence_node.length() == 2);
-  ASSERT(sequence_node.NodeAt(0)->IsStoreInstanceFieldNode());
-  ASSERT(sequence_node.NodeAt(1)->IsReturnNode());
-  const StoreInstanceFieldNode& store_node =
-      *sequence_node.NodeAt(0)->AsStoreInstanceFieldNode();
-  __ movl(EAX, Address(ESP, 2 * kWordSize));  // Receiver.
-  __ movl(EBX, Address(ESP, 1 * kWordSize));  // Value.
-  __ StoreIntoObject(EAX, FieldAddress(EAX, store_node.field().Offset()), EBX);
-  const Immediate raw_null =
-      Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  __ movl(EAX, raw_null);
-  __ ret();
-}
-
-
-bool OptimizingCodeGenerator::TryIntrinsify() {
-  if (FLAG_intrinsify && !FLAG_trace_functions) {
-    if ((parsed_function_.function().kind() == RawFunction::kImplicitGetter)) {
-      IntrinsifyGetter();
-      return true;
-    }
-    if ((parsed_function_.function().kind() == RawFunction::kImplicitSetter)) {
-      IntrinsifySetter();
-      return true;
-    }
-  }
-  // Even if an intrinsified version of the function was successfully
-  // generated, it may fall through to the non-intrinsified method body.
-  if (!FLAG_trace_functions) {
-    return Intrinsifier::Intrinsify(parsed_function().function(), assembler_);
-  }
-  return false;
-}
-
-
 // Check for stack overflow.
 // Note that first 5 bytes may be patched with a jump.
 // TODO(srdjan): Add check that no object is inlined in the first
 // 5 bytes (length of a jump instruction).
 void OptimizingCodeGenerator::GeneratePreEntryCode() {
 }
 
 
 void OptimizingCodeGenerator::CallDeoptimize(intptr_t node_id,
                                              intptr_t token_index) {
@@ skipping 2721 matching lines @@
     }
   }
   // TODO(srdjan): Implement unary kSUB (negate) Mint.
   CodeGenerator::VisitUnaryOpNode(node);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32