- Fix another side effect issue: never add AstNode to sequence unless they are a statement. Added t…

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"
@@ skipping 365 matching lines @@
   __ call(&StubCode::DeoptimizeLabel());
   AddCurrentDescriptor(PcDescriptors::kOther, node_id, token_index);
 #if defined(DEBUG)
   __ int3();
 #endif
 }
 
 
 // Quick loads do not clobber registers.
 static bool IsQuickLoad(AstNode* node) {
-  return node->IsLoadLocalNode() || node->IsLiteralNode();
+  if (node->IsLoadLocalNode() && (!node->AsLoadLocalNode()->HasPseudo())) {
+    return true;
+  }
+  return node->IsLiteralNode();
 }
 
 
 // Method is closely tied to "VisitLoadTwo".
 void OptimizingCodeGenerator::VisitLoadOne(AstNode* node, Register reg) {
   if (!IsQuickLoad(node)) {
     node->Visit(this);
     __ popl(reg);
     return;
   }
-  if (node->AsLoadLocalNode()) {
+  if (node->IsLoadLocalNode()) {
     LoadLocalNode* local_node = node->AsLoadLocalNode();
     ASSERT(local_node != NULL);
     GenerateLoadVariable(reg, local_node->local());
     if (node->info() != NULL) {
       const Class* cls = NULL;
       classes_for_locals_->GetLocalClass(local_node->local(), &cls);
       if (cls != NULL) {
         node->info()->set_is_class(cls);
       }
     }
     return;
   }
-  if (node->AsLiteralNode()) {
+  if (node->IsLiteralNode()) {
     LiteralNode* literal_node = node->AsLiteralNode();
     ASSERT(literal_node != NULL);
     __ LoadObject(reg, literal_node->literal());
     if (node->info() != NULL) {
       const Object& literal = literal_node->literal();
       if (literal.IsSmi()) {
         node->info()->set_is_class(&smi_class_);
       } else if (literal.IsDouble()) {
         node->info()->set_is_class(&double_class_);
       }
@@ skipping 55 matching lines @@
       __ LoadObject(EAX, literal);
       node->info()->set_result_returned_in_eax(true);
     } else {
       __ PushObject(literal);
     }
   }
 }
 
 
 void OptimizingCodeGenerator::VisitLoadLocalNode(LoadLocalNode* node) {
+  if (node->HasPseudo()) {
+    node->pseudo()->Visit(this);
+    __ popl(EAX);
+  }
   if (!IsResultNeeded(node)) return;
   if (IsResultInEaxRequested(node)) {
     GenerateLoadVariable(EAX, node->local());
     node->info()->set_result_returned_in_eax(true);
   } else {
     GeneratePushVariable(node->local(), EAX);
   }
   if (node->info() != NULL) {
     const Class* cls = NULL;
     classes_for_locals_->GetLocalClass(node->local(), &cls);
@@ skipping 2588 matching lines @@
     }
   }
   // TODO(srdjan): Implement unary kSUB (negate) Mint.
   CodeGenerator::VisitUnaryOpNode(node);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32