Correctly reset global isolate state after bailout from the flow-graph compiler.

vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 131 matching lines @@
               Code::Handle(function.unoptimized_code()).EntryPoint());
   }
 }
 
 
 // Return false if bailed out.
 static bool CompileWithNewCompiler(
     const ParsedFunction& parsed_function, bool optimized) {
   bool is_compiled = false;
   Isolate* isolate = Isolate::Current();
+  ASSERT(isolate->ic_data_array() == Array::null());  // Must be reset to null.
   const intptr_t prev_cid = isolate->computation_id();
   isolate->set_computation_id(0);
   LongJump* old_base = isolate->long_jump_base();
   LongJump bailout_jump;
   isolate->set_long_jump_base(&bailout_jump);
   if (setjmp(*bailout_jump.Set()) == 0) {
     GrowableArray<BlockEntryInstr*> block_order;
     // TimerScope needs an isolate to be properly terminated in case of a
     // LongJump.
     {
@@ skipping 34 matching lines @@
     }
 
     Assembler assembler;
     FlowGraphCompiler graph_compiler(&assembler, parsed_function,
                                      block_order, optimized);
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphcompiler_timer,
                        isolate);
       graph_compiler.CompileGraph();
-      isolate->set_ic_data_array(Array::null());
     }
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::codefinalizer_timer,
                        isolate);
       const Function& function = parsed_function.function();
       const Code& code = Code::Handle(Code::FinalizeCode(function, &assembler));
       code.set_is_optimized(optimized);
       graph_compiler.FinalizePcDescriptors(code);
       graph_compiler.FinalizeStackmaps(code);
@@ skipping 17 matching lines @@
   } else {
     // We bailed out.
     Error& bailout_error = Error::Handle(
         isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     if (FLAG_trace_bailout) {
       OS::Print("%s\n", bailout_error.ToErrorCString());
     }
     is_compiled = false;
   }
+  // Reset global isolate state.
+  isolate->set_ic_data_array(Array::null());
   isolate->set_long_jump_base(old_base);
   isolate->set_computation_id(prev_cid);
   return is_compiled;
 }
 
 
 static void CompileWithOldCompiler(
     const ParsedFunction& parsed_function, bool optimized) {
   const Function& function = parsed_function.function();
   Assembler assembler;
@@ skipping 312 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart