Fix issue 5564152 (VM crash): stack at exit of method was incorrect. Smi equality with Mint was c...

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 1581 matching lines @@
 
 
 // Generate code under assumption that it is common that a Smi
 // is compared with null.
 // Left argument can be Smi or null, otherwise deoptimize and collect more
 // type information.
 // Right operand can be Smi or null, otherwise call operator on Smi (e.g,
 // when compared with double).
 // This code will be more optimized once we collect types for two arguments.
 void OptimizingCodeGenerator::GenerateSmiEquality(ComparisonNode* node) {
+  const Bool& bool_true = Bool::ZoneHandle(Bool::True());
+  const Bool& bool_false = Bool::ZoneHandle(Bool::False());
   ASSERT((node->kind() == Token::kEQ) || (node->kind() == Token::kNE));
   CodeGenInfo left_info(node->left());
   CodeGenInfo right_info(node->right());
   VisitLoadTwo(node->left(), node->right(), EAX, EDX);
   if (!CodeGenerator::IsResultNeeded(node)) {
     return;
   }
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label evaluate_comparison;
@@ skipping 37 matching lines @@
     const int kNumberOfArguments = 2;
     const Array& kNoArgumentNames = Array::Handle();
     __ pushl(EAX);
     __ pushl(EDX);
     GenerateCheckedInstanceCalls(node,
                                  node->left(),
                                  node->id(),
                                  node->token_index(),
                                  kNumberOfArguments,
                                  kNoArgumentNames);
-    __ pushl(EAX);
-    __ jmp(&done, Assembler::kNearJump);
+    __ CompareObject(EAX, bool_true);
+    // Fall through to evaluate result.
   }
   __ Bind(&evaluate_comparison);
   // Condition is set by a previous comparison operation.
   Condition condition = OVERFLOW;  // Initialize to something.
   bool ok = SupportedTokenKindToSmiCondition(node->kind(), &condition);
   ASSERT(ok);
   if (NodeInfoHasLabels(node)) {
     GenerateConditionalJumps(*(node->info()), condition);
     node->info()->set_labels_used(true);
   } else {
-    const Bool& bool_true = Bool::ZoneHandle(Bool::True());
-    const Bool& bool_false = Bool::ZoneHandle(Bool::False());
     Label true_label;
     __ j(condition, &true_label, Assembler::kNearJump);
     __ PushObject(bool_false);
     __ jmp(&done, Assembler::kNearJump);
     __ Bind(&true_label);
     __ PushObject(bool_true);
   }
   __ Bind(&done);
 }
 
@@ skipping 756 matching lines @@
   __ addl(ESP, Immediate(node->arguments()->length() * kWordSize));
   // Result is in EAX.
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32