Real fix for breakage: if type in DECLARE_FLAG differs from DEFINE_FLAG, windows compiler is the on…

runtime/vm/intermediate_language_ia32.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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
+#include "vm/intermediate_language.h"
+
 #include "vm/flow_graph_compiler.h"
 #include "vm/locations.h"
 #include "vm/stub_code.h"
 
 #define __ compiler->assembler()->
 
 namespace dart {
 
-DECLARE_FLAG(bool, optimization_counter_threshold);
+DECLARE_FLAG(int, optimization_counter_threshold);
 DECLARE_FLAG(bool, trace_functions);
 
 // True iff. the arguments to a call will be properly pushed and can
 // be popped after the call.
 template <typename T> static bool VerifyCallComputation(T* comp) {
   // Argument values should be consecutive temps.
   //
   // TODO(kmillikin): implement stack height tracking so we can also assert
   // they are on top of the stack.
   intptr_t previous = -1;
@@ skipping 40 matching lines @@
   Register temp = locs()->temp(0).reg();
   ASSERT(result == EAX);
   if (!compiler->is_optimizing()) {
     // Count only in unoptimized code.
     // TODO(srdjan): Replace the counting code with a type feedback
     // collection and counting stub.
     const Function& function =
           Function::ZoneHandle(compiler->parsed_function().function().raw());
     __ LoadObject(temp, function);
     __ incl(FieldAddress(temp, Function::usage_counter_offset()));
-    /*if (CodeGenerator::CanOptimize()) {
+    if (CodeGenerator::CanOptimize()) {
       // Do not optimize if usage count must be reported.
       __ cmpl(FieldAddress(temp, Function::usage_counter_offset()),
           Immediate(FLAG_optimization_counter_threshold));
       Label not_yet_hot;
       __ j(LESS_EQUAL, &not_yet_hot, Assembler::kNearJump);
       __ pushl(result);  // Preserve result.
       __ pushl(temp);  // Argument for runtime: function to optimize.
       __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry);
       __ popl(temp);  // Remove argument.
       __ popl(result);  // Restore result.
       __ Bind(&not_yet_hot);
-    } */
+    }
   }
   if (FLAG_trace_functions) {
     const Function& function =
         Function::ZoneHandle(compiler->parsed_function().function().raw());
     __ LoadObject(temp, function);
     __ pushl(result);  // Preserve result.
     __ pushl(temp);
     compiler->GenerateCallRuntime(AstNode::kNoId,
                                   0,
                                   CatchClauseNode::kInvalidTryIndex,
@@ skipping 484 matching lines @@
     __ movl(locs()->out().reg(), EAX);
   }
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64