| Index: test/cctest/test-deoptimization.cc
|
| diff --git a/test/cctest/test-deoptimization.cc b/test/cctest/test-deoptimization.cc
|
| index 5ab84f96cb087eefc367a569f45b35762b649495..9942fd65233574bf7ba43d4fb2ae8bec8a6053e0 100644
|
| --- a/test/cctest/test-deoptimization.cc
|
| +++ b/test/cctest/test-deoptimization.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2007-2010 the V8 project authors. All rights reserved.
|
| +// Copyright 2011 the V8 project authors. All rights reserved.
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| // met:
|
| @@ -371,7 +371,7 @@ TEST(DeoptimizeBinaryOperationADDString) {
|
| i::FLAG_always_opt = true;
|
| CompileRun(f_source);
|
| CompileRun("f('a+', new X());");
|
| - CHECK(!i::V8::UseCrankshaft() ||
|
| + CHECK(i::FLAG_always_full_compiler ||
|
| GetJSFunction(env->Global(), "f")->IsOptimized());
|
|
|
| // Call f and force deoptimization while processing the binary operation.
|
| @@ -423,7 +423,7 @@ static void TestDeoptimizeBinaryOpHelper(LocalContext* env,
|
| i::FLAG_always_opt = true;
|
| CompileRun(f_source);
|
| CompileRun("f(7, new X());");
|
| - CHECK(!i::V8::UseCrankshaft() ||
|
| + CHECK(i::FLAG_always_full_compiler ||
|
| GetJSFunction((*env)->Global(), "f")->IsOptimized());
|
|
|
| // Call f and force deoptimization while processing the binary operation.
|
| @@ -534,7 +534,7 @@ TEST(DeoptimizeCompare) {
|
| i::FLAG_always_opt = true;
|
| CompileRun(f_source);
|
| CompileRun("f('a', new X());");
|
| - CHECK(!i::V8::UseCrankshaft() ||
|
| + CHECK(i::FLAG_always_full_compiler ||
|
| GetJSFunction(env->Global(), "f")->IsOptimized());
|
|
|
| // Call f and force deoptimization while processing the comparison.
|
| @@ -606,7 +606,7 @@ TEST(DeoptimizeLoadICStoreIC) {
|
| CompileRun("g1(new X());");
|
| CompileRun("f2(new X(), 'z');");
|
| CompileRun("g2(new X(), 'z');");
|
| - if (i::V8::UseCrankshaft()) {
|
| + if (!i::FLAG_always_full_compiler) {
|
| CHECK(GetJSFunction(env->Global(), "f1")->IsOptimized());
|
| CHECK(GetJSFunction(env->Global(), "g1")->IsOptimized());
|
| CHECK(GetJSFunction(env->Global(), "f2")->IsOptimized());
|
| @@ -692,7 +692,7 @@ TEST(DeoptimizeLoadICStoreICNested) {
|
| CompileRun("g1(new X());");
|
| CompileRun("f2(new X(), 'z');");
|
| CompileRun("g2(new X(), 'z');");
|
| - if (i::V8::UseCrankshaft()) {
|
| + if (!i::FLAG_always_full_compiler) {
|
| CHECK(GetJSFunction(env->Global(), "f1")->IsOptimized());
|
| CHECK(GetJSFunction(env->Global(), "g1")->IsOptimized());
|
| CHECK(GetJSFunction(env->Global(), "f2")->IsOptimized());
|
|
|