Use optimized code map to cache OSR code.

src/code-stubs-hydrogen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1174 matching lines @@
   }
   is_optimized.Else();
   {
     AddIncrementCounter(counters->fast_new_closure_try_optimized());
     // optimized_map points to fixed array of 3-element entries
     // (native context, optimized code, literals).
     // Map must never be empty, so check the first elements.
     Label install_optimized;
     HValue* first_context_slot = Add<HLoadNamedField>(optimized_map,
         HObjectAccess::ForFirstContextSlot());
+    HValue* first_osr_ast_slot = Add<HLoadNamedField>(optimized_map,
+        HObjectAccess::ForFirstOsrAstIdSlot());
+    HValue* not_osr_ast_id = Add<HConstant>(BailoutId::None().ToInt(),
+                                            Representation::Smi());
     IfBuilder already_in(this);
     already_in.If<HCompareObjectEqAndBranch>(native_context,
                                              first_context_slot);
+    already_in.AndIf<HCompareObjectEqAndBranch>(first_osr_ast_slot,
+                                                not_osr_ast_id);
     already_in.Then();
     {
       HValue* code_object = Add<HLoadNamedField>(optimized_map,
         HObjectAccess::ForFirstCodeSlot());
       BuildInstallOptimizedCode(js_function, native_context, code_object);
     }
     already_in.Else();
     {
       HValue* shared_function_entry_length =
           Add<HConstant>(SharedFunctionInfo::kEntryLength);
@@ skipping 17 matching lines @@
         restore_check.Then();
         {
           // Store the unoptimized code
           BuildInstallCode(js_function, shared_info);
           loop_builder.Break();
         }
         restore_check.Else();
         {
           HValue* keyed_minus = AddUncasted<HSub>(
               key, shared_function_entry_length);
+          HValue* key_for_osr_ast_id = AddUncasted<HSub>(
+              key, graph()->GetConstant1());
           HInstruction* keyed_lookup = Add<HLoadKeyed>(optimized_map,
               keyed_minus, static_cast<HValue*>(NULL), FAST_ELEMENTS);
+          HInstruction* osr_ast_id = Add<HLoadKeyed>(optimized_map,
+              key_for_osr_ast_id, static_cast<HValue*>(NULL), FAST_ELEMENTS);
           IfBuilder done_check(this);
           done_check.If<HCompareObjectEqAndBranch>(native_context,
                                                    keyed_lookup);
+          done_check.AndIf<HCompareObjectEqAndBranch>(osr_ast_id,
+                                                      not_osr_ast_id);
           done_check.Then();
           {
             // Hit: fetch the optimized code.
             HValue* keyed_plus = AddUncasted<HAdd>(
                 keyed_minus, graph()->GetConstant1());
             HValue* code_object = Add<HLoadKeyed>(optimized_map,
                 keyed_plus, static_cast<HValue*>(NULL), FAST_ELEMENTS);
             BuildInstallOptimizedCode(js_function, native_context, code_object);
 
             // Fall out of the loop
@@ skipping 80 matching lines @@
   return BuildUncheckedDictionaryElementLoad(receiver, key);
 }
 
 
 Handle<Code> KeyedLoadDictionaryElementStub::GenerateCode(Isolate* isolate) {
   return DoGenerateCode(isolate, this);
 }
 
 
 } }  // namespace v8::internal