Merge bleeding edge up to 9192 into the GC branch.

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

Index: test/mjsunit/assert-opt-and-deopt.js
diff --git a/test/mjsunit/assert-opt-and-deopt.js b/test/mjsunit/assert-opt-and-deopt.js
index c9de6cee572918bbcbedfa502e3099de0f875524..51cb99adc3354f47aa106e87a90e68a55d559663 100644
--- a/test/mjsunit/assert-opt-and-deopt.js
+++ b/test/mjsunit/assert-opt-and-deopt.js
@@ -54,7 +54,7 @@ OptTracker.OptimizationState = {
  * 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);
 };
@@ -148,7 +148,7 @@ 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);