Ensure that soft-deopts don't count against opt_count

src/runtime.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 7956 matching lines @@
 
   // Make sure to materialize objects before causing any allocation.
   JavaScriptFrameIterator it(isolate);
   deoptimizer->MaterializeHeapObjects(&it);
   delete deoptimizer;
 
   JavaScriptFrame* frame = it.frame();
   RUNTIME_ASSERT(frame->function()->IsJSFunction());
   Handle<JSFunction> function(JSFunction::cast(frame->function()), isolate);
   Handle<Code> optimized_code(function->code());
-  RUNTIME_ASSERT(type != Deoptimizer::EAGER || function->IsOptimized());
+  RUNTIME_ASSERT((type != Deoptimizer::EAGER &&
+                  type != Deoptimizer::SOFT) || function->IsOptimized());
 
   // Avoid doing too much work when running with --always-opt and keep
   // the optimized code around.
   if (FLAG_always_opt || type == Deoptimizer::LAZY) {
     return isolate->heap()->undefined_value();
   }
 
   // Find other optimized activations of the function or functions that
   // share the same optimized code.
   bool has_other_activations = false;
   while (!it.done()) {
     JavaScriptFrame* frame = it.frame();
     JSFunction* other_function = JSFunction::cast(frame->function());
     if (frame->is_optimized() && other_function->code() == function->code()) {
       has_other_activations = true;
       break;
     }
     it.Advance();
   }
 
   if (!has_other_activations) {
     ActivationsFinder activations_finder(*function);
     isolate->thread_manager()->IterateArchivedThreads(&activations_finder);
     has_other_activations = activations_finder.has_activations();
   }
 
+  if (type == Deoptimizer::SOFT) {
+    // Soft opts shouldn't count against the overall re-optimization count that

[Jakob Kummerow, 2013/05/14 11:01:57]

nit: s/opts/deopts/

[danno, 2013/05/14 11:29:09]

Done.

+    // can eventually lead to disabling optimization for a function.
+    int opt_count = function->shared()->opt_count();
+    if (opt_count > 0) opt_count--;
+    function->shared()->set_opt_count(opt_count);
+  }
+
   if (!has_other_activations) {
     if (FLAG_trace_deopt) {
       PrintF("[removing optimized code for: ");
       function->PrintName();
       PrintF("]\n");
     }
     function->ReplaceCode(function->shared()->code());
   } else {
     Deoptimizer::DeoptimizeFunction(*function);
   }
@@ skipping 5493 matching lines @@
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags,
                                        "Runtime::PerformGC");
   }
 }
 
 
 } }  // namespace v8::internal