Merge bleeding_edge 17696:18016.

test/mjsunit/load-callback-from-value-classic.js

Index: test/mjsunit/load-callback-from-value-classic.js
diff --git a/test/mjsunit/compiler/osr-assert.js b/test/mjsunit/load-callback-from-value-classic.js
similarity index 84%
copy from test/mjsunit/compiler/osr-assert.js
copy to test/mjsunit/load-callback-from-value-classic.js
index 94b901fd4f764b19c7e374b3e7c6013fa5bbd326..0030c61cf86d8ac0566dff935bd5ac7d34b175a0 100644
--- a/test/mjsunit/compiler/osr-assert.js
+++ b/test/mjsunit/load-callback-from-value-classic.js
@@ -25,17 +25,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Flags: --use-osr
+Object.defineProperty(Boolean.prototype, "v",
+                      {get:function() { return this; }});
 
-function f(x, b, c) {
-  var outer = 1000000;
-  var a = 1;
-  while (outer > 0) {
-    a = a + 5;
-    assertEquals(b + 1, c);
-    outer--;
-  }
-  return a + 4;
+function f(b) {
+  return b.v;
 }
 
-assertEquals(5000005, f(5, "122", "1221"));
+assertEquals("object", typeof f(true));
+assertEquals("object", typeof f(true));
+assertEquals("object", typeof f(true));
+assertEquals("object", typeof f(true));