1 files changed, 20 insertions, 14 deletions

diff --git a/deps/v8/test/mjsunit/string-charcodeat.js b/deps/v8/test/mjsunit/string-charcodeat.js
index 6031096e0b..f71b3ce66f 100644
--- a/deps/v8/test/mjsunit/string-charcodeat.js
+++ b/deps/v8/test/mjsunit/string-charcodeat.js
@@ -94,7 +94,9 @@ function Thing() {
 
 function NotAString() {
   var n = new Thing();
-  n.toString = function() { return "Test"; };
+  n.toString = function() {
+    return 'Test';
+  };
   n.charCodeAt = String.prototype.charCodeAt;
   return n;
 }
@@ -102,7 +104,9 @@ function NotAString() {
 
 function NotAString16() {
   var n = new Thing();
-  n.toString = function() { return "Te\u1234t"; };
+  n.toString = function() {
+    return 'Te\u1234t';
+  };
   n.charCodeAt = String.prototype.charCodeAt;
   return n;
 }
@@ -111,7 +115,7 @@ function NotAString16() {
 function TestStringType(generator, sixteen) {
   var g = generator;
   var len = g().toString().length;
-  var t = sixteen ? "t" : "f"
+  var t = sixteen ? 't' : 'f';
   t += generator.name;
   assertTrue(isNaN(g().charCodeAt(-1e19)), 1 + t);
   assertTrue(isNaN(g().charCodeAt(-0x80000001)), 2 + t);
@@ -157,8 +161,8 @@ TestStringType(NotAString16, true);
 function Flat16Optimized() {
   var str = Flat16();
   return str.charCodeAt(2);
-}
-
+};
+%PrepareFunctionForOptimization(Flat16Optimized);
 assertEquals(0x1234, Flat16Optimized());
 assertEquals(0x1234, Flat16Optimized());
 %OptimizeFunctionOnNextCall(Flat16Optimized);
@@ -167,8 +171,8 @@ assertEquals(0x1234, Flat16Optimized());
 function ConsNotSmiIndex() {
   var str = Cons();
   assertTrue(isNaN(str.charCodeAt(0x7fffffff)));
-}
-
+};
+%PrepareFunctionForOptimization(ConsNotSmiIndex);
 for (var i = 0; i < 5; i++) {
   ConsNotSmiIndex();
 }
@@ -183,7 +187,9 @@ for (var i = 0; i != 10; i++) {
 
 function StupidThing() {
   // Doesn't return a string from toString!
-  this.toString = function() { return 42; }
+  this.toString = function() {
+    return 42;
+  };
   this.charCodeAt = String.prototype.charCodeAt;
 }
 
@@ -203,10 +209,10 @@ medium += medium; // 128.
 medium += medium; // 256.
 
 var long = medium;
-long += long + long + long;     // 1024.
-long += long + long + long;     // 4096.
-long += long + long + long;     // 16384.
-long += long + long + long;     // 65536.
+long += long + long + long;  // 1024.
+long += long + long + long;  // 4096.
+long += long + long + long;  // 16384.
+long += long + long + long;  // 65536.
 
 assertTrue(isNaN(medium.charCodeAt(-1)), 31);
 assertEquals(49, medium.charCodeAt(0), 32);
@@ -232,8 +238,8 @@ function directlyOnPrototype() {
   assertEquals(97, "a".x(0));
   assertEquals(98, "b".x(0));
   assertEquals(99, "c".x(0));
-}
-
+};
+%PrepareFunctionForOptimization(directlyOnPrototype);
 for (var i = 0; i < 5; i++) {
   directlyOnPrototype();
 }