Fix crash in OSR with --optimization-counter-threshold=-1: do not check for OSR if the optimizaiton…

runtime/vm/intermediate_language_ia32.cc

 // Copyright (c) 2013, 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 "lib/error.h"
@@ skipping 2129 matching lines @@
 };
 
 
 void CheckStackOverflowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   CheckStackOverflowSlowPath* slow_path = new CheckStackOverflowSlowPath(this);
   compiler->AddSlowPathCode(slow_path);
 
   __ cmpl(ESP,
           Address::Absolute(Isolate::Current()->stack_limit_address()));
   __ j(BELOW_EQUAL, slow_path->entry_label());
-  if (FLAG_use_osr && !compiler->is_optimizing() && in_loop()) {
+  if (FLAG_use_osr && compiler->CanOptimizeFunction() &&
+      !compiler->is_optimizing() && in_loop()) {

[siva, 2013/06/17 21:31:40]

Would it make sense to have a CanOSRFunction() helper which
covers these conditions, the code would become

if (compiler->CanOSRFunction() && in_loop()) {
...
}

[srdjan, 2013/06/17 21:46:14]

Done

     // In unoptimized code check the usage counter to trigger OSR at loop
     // stack checks.
     __ LoadObject(EDI, compiler->parsed_function().function());
     __ cmpl(FieldAddress(EDI, Function::usage_counter_offset()),
             Immediate(2 * FLAG_optimization_counter_threshold));
     __ j(GREATER_EQUAL, slow_path->entry_label());
   }
   __ Bind(slow_path->exit_label());
 }
 
@@ skipping 2598 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_IA32