Reviewers: Mads Ager,
Message:
I was bored while waiting for tests to complete, so I fixed one that was
timing
out on ARM in release mode. PTAL.
Description:
Fix timeout of test regress-1118.js
TEST=mjsunit/regress/regress-1118.js no longer times out when run in the ARM
simulator.
Please review this at http://codereview.chromium.org/6994010/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M test/mjsunit/regress/regress-1118.js
Index: test/mjsunit/regress/regress-1118.js
diff --git a/test/mjsunit/regress/regress-1118.js
b/test/mjsunit/regress/regress-1118.js
index
84f96e4639c699da937ebf8616bcd94339e6ccd9..b58276d26f796a26d7908214f855632381dcecf7
100644
--- a/test/mjsunit/regress/regress-1118.js
+++ b/test/mjsunit/regress/regress-1118.js
@@ -25,6 +25,8 @@
// (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
+
// An exception thrown in a function optimized by on-stack replacement
(OSR)
// should be able to construct a receiver from all optimized stack frames.
@@ -39,10 +41,24 @@ var o = new A();
// inlined.
function g() { try { return o.f(); } finally { }}
+// Optimization status (see runtime.cc):
+// 1 - yes, 2 - no, 3 - always, 4 - never.
+
// This function should be optimized via OSR.
function h() {
- while(false) ;
- for (var j = 0; j < 5000000; j++) g();
+ optstatus = %GetOptimizationStatus(h);
+ if (optstatus == 4) {
+ // Optimizations are globally disabled; just run once.
+ g();
+ } else {
+ // Run for a bit as long as h is unoptimized.
+ while (%GetOptimizationStatus(h) == 2) {
+ for (var j = 0; j < 100; j++) g();
+ }
+ assertTrue(%GetOptimizationStatus(h) == 1 ||
+ %GetOptimizationStatus(h) == 3);
+ g();
+ }
}
h();
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
