Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/cctest/test-deoptimization.cc

Issue 1458003006: Remove usage of deprecated APIs from compiler/deopt test (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: updates Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/cctest/test-compiler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/test-deoptimization.cc
diff --git a/test/cctest/test-deoptimization.cc b/test/cctest/test-deoptimization.cc
index e6604a379e4530cf8b75df3355bd8c569efed314..ad3cf2fcfbdf4c28993ed275965a809c78008914 100644
--- a/test/cctest/test-deoptimization.cc
+++ b/test/cctest/test-deoptimization.cc
@@ -25,6 +25,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// TODO(jochen): Remove this after the setting is turned on globally.
+#define V8_IMMINENT_DEPRECATION_WARNINGS
+
#include <stdlib.h>
#include "src/v8.h"
@@ -113,10 +116,10 @@ static void NonIncrementalGC(i::Isolate* isolate) {
}
-static Handle<JSFunction> GetJSFunction(v8::Handle<v8::Object> obj,
+static Handle<JSFunction> GetJSFunction(v8::Local<v8::Context> context,
const char* property_name) {
- v8::Local<v8::Function> fun =
- v8::Local<v8::Function>::Cast(obj->Get(v8_str(property_name)));
+ v8::Local<v8::Function> fun = v8::Local<v8::Function>::Cast(
+ context->Global()->Get(context, v8_str(property_name)).ToLocalChecked());
return i::Handle<i::JSFunction>::cast(v8::Utils::OpenHandle(*fun));
}
@@ -137,8 +140,12 @@ TEST(DeoptimizeSimple) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
// Test lazy deoptimization of a simple function. Call the function after the
@@ -153,8 +160,12 @@ TEST(DeoptimizeSimple) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
@@ -175,8 +186,12 @@ TEST(DeoptimizeSimpleWithArguments) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
// Test lazy deoptimization of a simple function with some arguments. Call the
@@ -192,8 +207,12 @@ TEST(DeoptimizeSimpleWithArguments) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
@@ -215,9 +234,17 @@ TEST(DeoptimizeSimpleNested) {
"result = f(1, 2, 3);");
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(6, env->Global()->Get(v8_str("result"))->Int32Value());
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(6, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
}
@@ -240,12 +267,22 @@ TEST(DeoptimizeRecursive) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(11, env->Global()->Get(v8_str("calls"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(11, env->Global()
+ ->Get(env.local(), v8_str("calls"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
v8::Local<v8::Function> fun = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::NewFromUtf8(CcTest::isolate(), "f")));
+ env->Global()
+ ->Get(env.local(), v8_str(CcTest::isolate(), "f"))
+ .ToLocalChecked());
CHECK(!fun.IsEmpty());
}
@@ -272,8 +309,16 @@ TEST(DeoptimizeMultiple) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(14, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(14, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
@@ -293,8 +338,15 @@ TEST(DeoptimizeConstructor) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK(env->Global()->Get(v8_str("result"))->IsTrue());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK(env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->IsTrue());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
{
@@ -310,8 +362,16 @@ TEST(DeoptimizeConstructor) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(3, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(3, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
@@ -339,8 +399,16 @@ TEST(DeoptimizeConstructorMultiple) {
}
NonIncrementalGC(CcTest::i_isolate());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(14, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(14, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(CcTest::i_isolate()));
}
@@ -382,7 +450,7 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationADDString) {
CompileRun(f_source);
CompileRun("f('a+', new X());");
CHECK(!i_isolate->use_crankshaft() ||
- GetJSFunction(env->Global(), "f")->IsOptimized());
+ GetJSFunction(env.local(), "f")->IsOptimized());
// Call f and force deoptimization while processing the binary operation.
CompileRun(
@@ -391,9 +459,14 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationADDString) {
}
NonIncrementalGC(i_isolate);
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- v8::Handle<v8::Value> result = env->Global()->Get(v8_str("result"));
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ v8::Local<v8::Value> result =
+ env->Global()->Get(env.local(), v8_str("result")).ToLocalChecked();
CHECK(result->IsString());
v8::String::Utf8Value utf8(result);
CHECK_EQ(0, strcmp("a+an X", *utf8));
@@ -439,13 +512,13 @@ static void TestDeoptimizeBinaryOpHelper(LocalContext* env,
CompileRun(f_source);
CompileRun("f(7, new X());");
CHECK(!i_isolate->use_crankshaft() ||
- GetJSFunction((*env)->Global(), "f")->IsOptimized());
+ GetJSFunction((*env).local(), "f")->IsOptimized());
// Call f and force deoptimization while processing the binary operation.
CompileRun("deopt = true;"
"var result = f(7, new X());");
NonIncrementalGC(i_isolate);
- CHECK(!GetJSFunction((*env)->Global(), "f")->IsOptimized());
+ CHECK(!GetJSFunction((*env).local(), "f")->IsOptimized());
}
@@ -462,8 +535,16 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationADD) {
TestDeoptimizeBinaryOpHelper(&env, "+");
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(15, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(15, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -484,8 +565,16 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationSUB) {
TestDeoptimizeBinaryOpHelper(&env, "-");
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(-1, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(-1, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -506,8 +595,16 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationMUL) {
TestDeoptimizeBinaryOpHelper(&env, "*");
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(56, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(56, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -528,8 +625,16 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationDIV) {
TestDeoptimizeBinaryOpHelper(&env, "/");
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(0, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(0, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -550,8 +655,16 @@ UNINITIALIZED_TEST(DeoptimizeBinaryOperationMOD) {
TestDeoptimizeBinaryOpHelper(&env, "%");
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(7, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(7, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -596,7 +709,7 @@ UNINITIALIZED_TEST(DeoptimizeCompare) {
CompileRun(f_source);
CompileRun("f('a', new X());");
CHECK(!i_isolate->use_crankshaft() ||
- GetJSFunction(env->Global(), "f")->IsOptimized());
+ GetJSFunction(env.local(), "f")->IsOptimized());
// Call f and force deoptimization while processing the comparison.
CompileRun(
@@ -605,9 +718,17 @@ UNINITIALIZED_TEST(DeoptimizeCompare) {
}
NonIncrementalGC(i_isolate);
- CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(true, env->Global()->Get(v8_str("result"))->BooleanValue());
+ CHECK(!GetJSFunction(env.local(), "f")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(true, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->BooleanValue(env.local())
+ .FromJust());
CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
}
isolate->Exit();
@@ -679,10 +800,10 @@ UNINITIALIZED_TEST(DeoptimizeLoadICStoreIC) {
CompileRun("f2(new X(), 'z');");
CompileRun("g2(new X(), 'z');");
if (i_isolate->use_crankshaft()) {
- CHECK(GetJSFunction(env->Global(), "f1")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "g1")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "f2")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "g2")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "f1")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "g1")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "f2")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "g2")->IsOptimized());
}
// Call functions and force deoptimization while processing the ics.
@@ -695,12 +816,20 @@ UNINITIALIZED_TEST(DeoptimizeLoadICStoreIC) {
}
NonIncrementalGC(i_isolate);
- CHECK(!GetJSFunction(env->Global(), "f1")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "g1")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "f2")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "g2")->IsOptimized());
- CHECK_EQ(4, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(13, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK(!GetJSFunction(env.local(), "f1")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "g1")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "f2")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "g2")->IsOptimized());
+ CHECK_EQ(4, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(13, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
}
isolate->Exit();
isolate->Dispose();
@@ -775,10 +904,10 @@ UNINITIALIZED_TEST(DeoptimizeLoadICStoreICNested) {
CompileRun("f2(new X(), 'z');");
CompileRun("g2(new X(), 'z');");
if (i_isolate->use_crankshaft()) {
- CHECK(GetJSFunction(env->Global(), "f1")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "g1")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "f2")->IsOptimized());
- CHECK(GetJSFunction(env->Global(), "g2")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "f1")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "g1")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "f2")->IsOptimized());
+ CHECK(GetJSFunction(env.local(), "g2")->IsOptimized());
}
// Call functions and force deoptimization while processing the ics.
@@ -788,12 +917,20 @@ UNINITIALIZED_TEST(DeoptimizeLoadICStoreICNested) {
}
NonIncrementalGC(i_isolate);
- CHECK(!GetJSFunction(env->Global(), "f1")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "g1")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "f2")->IsOptimized());
- CHECK(!GetJSFunction(env->Global(), "g2")->IsOptimized());
- CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
- CHECK_EQ(13, env->Global()->Get(v8_str("result"))->Int32Value());
+ CHECK(!GetJSFunction(env.local(), "f1")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "g1")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "f2")->IsOptimized());
+ CHECK(!GetJSFunction(env.local(), "g2")->IsOptimized());
+ CHECK_EQ(1, env->Global()
+ ->Get(env.local(), v8_str("count"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
+ CHECK_EQ(13, env->Global()
+ ->Get(env.local(), v8_str("result"))
+ .ToLocalChecked()
+ ->Int32Value(env.local())
+ .FromJust());
}
isolate->Exit();
isolate->Dispose();
« no previous file with comments | « test/cctest/test-compiler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698