Merged r19535, r19549, r19586, r19584 into trunk branch.

test/mjsunit/regress/regress-347262.js

Index: test/mjsunit/regress/regress-347262.js
diff --git a/test/mjsunit/regress/regress-346343.js b/test/mjsunit/regress/regress-347262.js
similarity index 75%
copy from test/mjsunit/regress/regress-346343.js
copy to test/mjsunit/regress/regress-347262.js
index e4c10663138db599a682880df98f3310e0754b63..76bc34a2cdc068057516617671e01c1173c7b6f3 100644
--- a/test/mjsunit/regress/regress-346343.js
+++ b/test/mjsunit/regress/regress-347262.js
@@ -27,16 +27,36 @@
 
 // Flags: --allow-natives-syntax
 
-function f(o) {
-  for (var i = 1; i < 2; ++i) {
-    var y = o.y;
+(function ArgumentsObjectWithOtherArgumentsInFrame() {
+  function g() {
+    return g.arguments;
   }
-}
-f({y:1.1});
-f({y:1.1});
 
-function g(x) { f({z:x}); }
-g(1);
-g(2);
-%OptimizeFunctionOnNextCall(g);
-g(1);
+  function f(x) {
+    g();
+    return arguments[0];
+  }
+  f();
+  f();
+  %OptimizeFunctionOnNextCall(f);
+  f();
+})();
+
+
+(function ArgumentsObjectWithOtherArgumentsDeopt() {
+  function g(y) {
+    y.o2 = 2;
+    return g.arguments;
+  }
+
+  function f(x) {
+    var o1 = { o2 : 1 };
+    var a = g(o1);
+    o1.o2 = 3;
+    return arguments[0] + a[0].o2;
+  }
+  f(0);
+  f(0);
+  %OptimizeFunctionOnNextCall(f);
+  assertEquals(3, f(0));
+})();