Index: test/mjsunit/compiler/inline-accessors.js |
diff --git a/test/mjsunit/compiler/inline-accessors.js b/test/mjsunit/compiler/inline-accessors.js |
index a4cf7ae8c112356c33bd4067482b6df8889994b9..41302c12388e874675d7f9b571d8bc192f17fdcc 100644 |
--- a/test/mjsunit/compiler/inline-accessors.js |
+++ b/test/mjsunit/compiler/inline-accessors.js |
@@ -25,68 +25,52 @@ |
// (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: --allow-natives-syntax --inline-accessors --max-opt-count=100 |
+// Flags: --allow-natives-syntax --inline-accessors |
var accessorCallCount, setterArgument, setterValue, obj, forceDeopt; |
// ----------------------------------------------------------------------------- |
// Helpers for testing inlining of getters. |
-function TestInlinedGetter(context, obj, expected) { |
- forceDeopt = { deopt: 0 }; |
+function TestInlinedGetter(context, expected) { |
+ forceDeopt = 0; |
accessorCallCount = 0; |
- assertEquals(expected, context(obj)); |
+ assertEquals(expected, context()); |
assertEquals(1, accessorCallCount); |
- assertEquals(expected, context(obj)); |
+ assertEquals(expected, context()); |
assertEquals(2, accessorCallCount); |
%OptimizeFunctionOnNextCall(context); |
- assertEquals(expected, context(obj)); |
+ assertEquals(expected, context()); |
assertEquals(3, accessorCallCount); |
- forceDeopt = { /* empty*/ }; |
- assertEquals(expected, context(obj)); |
- assertEquals(4, accessorCallCount); |
+ %DeoptimizeFunction(context); |
+ %ClearFunctionTypeFeedback(context); |
} |
-function value_context_for_getter(obj) { |
- return obj.getterProperty; |
-} |
- |
-function test_context_for_getter(obj) { |
- if (obj.getterProperty) { |
- return 111; |
- } else { |
- return 222; |
+function TestGetterInAllContexts(obj, expected) { |
+ function value_context() { |
+ return obj.getterProperty; |
} |
-} |
- |
-function effect_context_for_getter(obj) { |
- obj.getterProperty; |
- return 5678; |
-} |
- |
-function TryGetter(context, getter, obj, expected, expectException) { |
- try { |
- TestInlinedGetter(context, obj, expected); |
- assertFalse(expectException); |
- } catch (exception) { |
- assertTrue(expectException); |
- assertEquals(7, exception.stack.split('\n').length); |
+ TestInlinedGetter(value_context, expected); |
+ |
+ function test_context() { |
+ if (obj.getterProperty) { |
+ return 111; |
+ } else { |
+ return 222; |
+ } |
} |
- %DeoptimizeFunction(context); |
- %ClearFunctionTypeFeedback(context); |
- %ClearFunctionTypeFeedback(getter); |
-} |
+ TestInlinedGetter(test_context, expected ? 111 : 222); |
-function TestGetterInAllContexts(getter, obj, expected, expectException) { |
- TryGetter(value_context_for_getter, getter, obj, expected, expectException); |
- TryGetter(test_context_for_getter, getter, obj, expected ? 111 : 222, |
- expectException); |
- TryGetter(effect_context_for_getter, getter, obj, 5678, expectException); |
+ function effect_context() { |
+ obj.getterProperty; |
+ return 5678; |
+ } |
+ TestInlinedGetter(effect_context, 5678); |
} |
// ----------------------------------------------------------------------------- |
@@ -95,15 +79,15 @@ function TestGetterInAllContexts(getter, obj, expected, expectException) { |
function getter1() { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
return 1234; |
} |
function ConstrG1() { } |
obj = Object.defineProperty(new ConstrG1(), "getterProperty", { get: getter1 }); |
-TestGetterInAllContexts(getter1, obj, 1234, false); |
+TestGetterInAllContexts(obj, 1234); |
obj = Object.create(obj); |
-TestGetterInAllContexts(getter1, obj, 1234, false); |
+TestGetterInAllContexts(obj, 1234); |
// ----------------------------------------------------------------------------- |
// Test getter returning false in all contexts. |
@@ -111,15 +95,15 @@ TestGetterInAllContexts(getter1, obj, 1234, false); |
function getter2() { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
return false; |
} |
function ConstrG2() { } |
obj = Object.defineProperty(new ConstrG2(), "getterProperty", { get: getter2 }); |
-TestGetterInAllContexts(getter2, obj, false, false); |
+TestGetterInAllContexts(obj, false); |
obj = Object.create(obj); |
-TestGetterInAllContexts(getter2, obj, false, false); |
+TestGetterInAllContexts(obj, false); |
// ----------------------------------------------------------------------------- |
// Test getter without a return in all contexts. |
@@ -127,14 +111,14 @@ TestGetterInAllContexts(getter2, obj, false, false); |
function getter3() { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
} |
function ConstrG3() { } |
obj = Object.defineProperty(new ConstrG3(), "getterProperty", { get: getter3 }); |
-TestGetterInAllContexts(getter3, obj, undefined, false); |
+TestGetterInAllContexts(obj, undefined); |
obj = Object.create(obj); |
-TestGetterInAllContexts(getter3, obj, undefined, false); |
+TestGetterInAllContexts(obj, undefined); |
// ----------------------------------------------------------------------------- |
// Test getter with too many arguments without a return in all contexts. |
@@ -143,14 +127,14 @@ function getter4(a) { |
assertSame(obj, this); |
assertEquals(undefined, a); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
} |
function ConstrG4() { } |
obj = Object.defineProperty(new ConstrG4(), "getterProperty", { get: getter4 }); |
-TestGetterInAllContexts(getter4, obj, undefined, false); |
+TestGetterInAllContexts(obj, undefined); |
obj = Object.create(obj); |
-TestGetterInAllContexts(getter4, obj, undefined, false); |
+TestGetterInAllContexts(obj, undefined); |
// ----------------------------------------------------------------------------- |
// Test getter with too many arguments with a return in all contexts. |
@@ -159,95 +143,62 @@ function getter5(a) { |
assertSame(obj, this); |
assertEquals(undefined, a); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
return 9876; |
} |
function ConstrG5() { } |
obj = Object.defineProperty(new ConstrG5(), "getterProperty", { get: getter5 }); |
-TestGetterInAllContexts(getter5, obj, 9876, false); |
-obj = Object.create(obj); |
-TestGetterInAllContexts(getter5, obj, 9876, false); |
- |
-// ----------------------------------------------------------------------------- |
-// Test getter which throws from optimized code. |
- |
-function getter6() { |
- assertSame(obj, this); |
- accessorCallCount++; |
- forceDeopt.deopt; |
- if (accessorCallCount == 4) { 123 in null; } |
- return 13579; |
-} |
- |
-function ConstrG6() { } |
-obj = Object.defineProperty(new ConstrG6(), "getterProperty", { get: getter6 }); |
-TestGetterInAllContexts(getter6, obj, 13579, true); |
+TestGetterInAllContexts(obj, 9876); |
obj = Object.create(obj); |
-TestGetterInAllContexts(getter6, obj, 13579, true); |
+TestGetterInAllContexts(obj, 9876); |
// ----------------------------------------------------------------------------- |
// Helpers for testing inlining of setters. |
-function TestInlinedSetter(context, obj, value, expected) { |
- forceDeopt = { deopt: 0 }; |
+function TestInlinedSetter(context, value, expected) { |
+ forceDeopt = 0; |
accessorCallCount = 0; |
setterArgument = value; |
- assertEquals(expected, context(obj, value)); |
+ assertEquals(expected, context(value)); |
assertEquals(value, setterValue); |
assertEquals(1, accessorCallCount); |
- assertEquals(expected, context(obj, value)); |
+ assertEquals(expected, context(value)); |
assertEquals(value, setterValue); |
assertEquals(2, accessorCallCount); |
%OptimizeFunctionOnNextCall(context); |
- assertEquals(expected, context(obj, value)); |
+ assertEquals(expected, context(value)); |
assertEquals(value, setterValue); |
assertEquals(3, accessorCallCount); |
- forceDeopt = { /* empty*/ }; |
- assertEquals(expected, context(obj, value)); |
- assertEquals(value, setterValue); |
- assertEquals(4, accessorCallCount); |
-} |
- |
-function value_context_for_setter(obj, value) { |
- return obj.setterProperty = value; |
+ %DeoptimizeFunction(context); |
+ %ClearFunctionTypeFeedback(context); |
} |
-function test_context_for_setter(obj, value) { |
- if (obj.setterProperty = value) { |
- return 333; |
- } else { |
- return 444; |
+function TestSetterInAllContexts(obj) { |
+ function value_context(value) { |
+ return obj.setterProperty = value; |
} |
-} |
- |
-function effect_context_for_setter(obj, value) { |
- obj.setterProperty = value; |
- return 666; |
-} |
- |
-function TrySetter(context, setter, obj, expectException, value, expected) { |
- try { |
- TestInlinedSetter(context, obj, value, expected); |
- assertFalse(expectException); |
- } catch (exception) { |
- assertTrue(expectException); |
- assertEquals(7, exception.stack.split('\n').length); |
+ TestInlinedSetter(value_context, 111, 111); |
+ |
+ function test_context(value) { |
+ if (obj.setterProperty = value) { |
+ return 333; |
+ } else { |
+ return 444; |
+ } |
} |
- %DeoptimizeFunction(context); |
- %ClearFunctionTypeFeedback(context); |
- %ClearFunctionTypeFeedback(setter); |
-} |
+ TestInlinedSetter(test_context, true, 333); |
+ TestInlinedSetter(test_context, false, 444); |
-function TestSetterInAllContexts(setter, obj, expectException) { |
- TrySetter(value_context_for_setter, setter, obj, expectException, 111, 111); |
- TrySetter(test_context_for_setter, setter, obj, expectException, true, 333); |
- TrySetter(test_context_for_setter, setter, obj, expectException, false, 444); |
- TrySetter(effect_context_for_setter, setter, obj, expectException, 555, 666); |
+ function effect_context(value) { |
+ obj.setterProperty = value; |
+ return 666; |
+ } |
+ TestInlinedSetter(effect_context, 555, 666); |
} |
// ----------------------------------------------------------------------------- |
@@ -256,15 +207,15 @@ function TestSetterInAllContexts(setter, obj, expectException) { |
function setter1(value) { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = value; |
} |
function ConstrS1() { } |
obj = Object.defineProperty(new ConstrS1(), "setterProperty", { set: setter1 }); |
-TestSetterInAllContexts(setter1, obj, false); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter1, obj, false); |
+TestSetterInAllContexts(obj); |
// ----------------------------------------------------------------------------- |
// Test setter returning something different than the RHS in all contexts. |
@@ -272,16 +223,16 @@ TestSetterInAllContexts(setter1, obj, false); |
function setter2(value) { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = value; |
return 1000000; |
} |
function ConstrS2() { } |
obj = Object.defineProperty(new ConstrS2(), "setterProperty", { set: setter2 }); |
-TestSetterInAllContexts(setter2, obj, false); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter2, obj, false); |
+TestSetterInAllContexts(obj); |
// ----------------------------------------------------------------------------- |
// Test setter with too few arguments without a return in all contexts. |
@@ -289,15 +240,15 @@ TestSetterInAllContexts(setter2, obj, false); |
function setter3() { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = setterArgument; |
} |
function ConstrS3() { } |
obj = Object.defineProperty(new ConstrS3(), "setterProperty", { set: setter3 }); |
-TestSetterInAllContexts(setter3, obj, false); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter3, obj, false); |
+TestSetterInAllContexts(obj); |
// ----------------------------------------------------------------------------- |
// Test setter with too few arguments with a return in all contexts. |
@@ -305,16 +256,16 @@ TestSetterInAllContexts(setter3, obj, false); |
function setter4() { |
assertSame(obj, this); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = setterArgument; |
return 2000000; |
} |
function ConstrS4() { } |
obj = Object.defineProperty(new ConstrS4(), "setterProperty", { set: setter4 }); |
-TestSetterInAllContexts(setter4, obj, false); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter4, obj, false); |
+TestSetterInAllContexts(obj); |
// ----------------------------------------------------------------------------- |
// Test setter with too many arguments without a return in all contexts. |
@@ -323,15 +274,15 @@ function setter5(value, foo) { |
assertSame(obj, this); |
assertEquals(undefined, foo); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = value; |
} |
function ConstrS5() { } |
obj = Object.defineProperty(new ConstrS5(), "setterProperty", { set: setter5 }); |
-TestSetterInAllContexts(setter5, obj, false); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter5, obj, false); |
+TestSetterInAllContexts(obj); |
// ----------------------------------------------------------------------------- |
// Test setter with too many arguments with a return in all contexts. |
@@ -340,29 +291,13 @@ function setter6(value, foo) { |
assertSame(obj, this); |
assertEquals(undefined, foo); |
accessorCallCount++; |
- forceDeopt.deopt; |
+ forceDeopt + 1; |
setterValue = value; |
return 3000000; |
} |
function ConstrS6() { } |
obj = Object.defineProperty(new ConstrS6(), "setterProperty", { set: setter6 }); |
-TestSetterInAllContexts(setter6, obj, false); |
-obj = Object.create(obj); |
-TestSetterInAllContexts(setter6, obj, false); |
- |
-// ----------------------------------------------------------------------------- |
-// Test setter which throws from optimized code. |
- |
-function setter7(value) { |
- accessorCallCount++; |
- forceDeopt.deopt; |
- if (accessorCallCount == 4) { 123 in null; } |
- setterValue = value; |
-} |
- |
-function ConstrS7() { } |
-obj = Object.defineProperty(new ConstrS7(), "setterProperty", { set: setter7 }); |
-TestSetterInAllContexts(setter7, obj, true); |
+TestSetterInAllContexts(obj); |
obj = Object.create(obj); |
-TestSetterInAllContexts(setter7, obj, true); |
+TestSetterInAllContexts(obj); |