Merge bleeding edge up to 9192 into the GC branch.

test/mjsunit/assert-opt-and-deopt.js

 // Copyright 2011 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 36 matching lines @@
     NO: 2,
     ALWAYS: 3,
     NEVER: 4
 };
 
 /**
  * Always call this at the beginning of your test, once for each function
  * that you later want to track de/optimizations for. It is necessary because
  * tests are sometimes executed several times in a row, and you want to
  * disregard counts from previous runs.
- */ 
+ */
 OptTracker.prototype.CheckpointOptCount = function(func) {
   this.opt_counts_[func] = %GetOptimizationCount(func);
 };
 
 OptTracker.prototype.AssertOptCount = function(func, optcount) {
   if (this.DisableAsserts_(func)) {
     return;
   }
   assertEquals(optcount, this.GetOptCount_(func));
 };
@@ skipping 73 matching lines @@
 }
 
 var tracker = new OptTracker();
 tracker.CheckpointOptCount(f);
 
 tracker.AssertOptCount(f, 0);
 tracker.AssertIsOptimized(f, false);
 tracker.AssertDeoptHappened(f, false);
 tracker.AssertDeoptCount(f, 0);
 
-for (var i = 0; i < 2; i++) f(1);
+f(1);
 
 %OptimizeFunctionOnNextCall(f);
 f(1);
 
 tracker.AssertOptCount(f, 1);
 tracker.AssertIsOptimized(f, true);
 tracker.AssertDeoptHappened(f, false);
 tracker.AssertDeoptCount(f, 0);
 
 %DeoptimizeFunction(f);
 
 tracker.AssertOptCount(f, 1);
 tracker.AssertIsOptimized(f, false);
 tracker.AssertDeoptHappened(f, true);
 tracker.AssertDeoptCount(f, 1);
 
 // Let's trigger optimization for another type.
 for (var i = 0; i < 5; i++) f("a");
 
 %OptimizeFunctionOnNextCall(f);
 f("b");
 
 tracker.AssertOptCount(f, 2);
 tracker.AssertIsOptimized(f, true);
 tracker.AssertDeoptHappened(f, true);
 tracker.AssertDeoptCount(f, 1);