summaryrefslogtreecommitdiff
path: root/deps/v8/test/unittests
diff options
context:
space:
mode:
authorMatt Loring <mattloring@google.com>2017-08-03 07:14:43 -0700
committerAnna Henningsen <anna@addaleax.net>2017-08-17 20:26:28 +0200
commit64162a1041f293bfafb7bc8d030a83e5ab5e8b69 (patch)
treed983f2bd7445b97de9fe2b760f8ad3ba52a58a37 /deps/v8/test/unittests
parent354a17b0c090f88e29936b3a72dfed673cc68c4d (diff)
downloadandroid-node-v8-64162a1041f293bfafb7bc8d030a83e5ab5e8b69.tar.gz
android-node-v8-64162a1041f293bfafb7bc8d030a83e5ab5e8b69.tar.bz2
android-node-v8-64162a1041f293bfafb7bc8d030a83e5ab5e8b69.zip
deps: backport bca8409 from upstream V8
Original commit message: Make CancelableTask ids unique They were only limited to 32 bit when using the internal Hashmap. Since this has changed alreay some time ago, we can switch to 64 bit ids and check that we never overflow. Bug: Change-Id: Ia6c6d02d6b5e555c6941185a79427dc4aa2a1d62 Reviewed-on: https://chromium-review.googlesource.com/598229 Commit-Queue: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#47085} PR-URL: https://github.com/nodejs/node/pull/14001 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'deps/v8/test/unittests')
-rw-r--r--deps/v8/test/unittests/cancelable-tasks-unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/v8/test/unittests/cancelable-tasks-unittest.cc b/deps/v8/test/unittests/cancelable-tasks-unittest.cc
index eb5dd91589..d0462877f5 100644
--- a/deps/v8/test/unittests/cancelable-tasks-unittest.cc
+++ b/deps/v8/test/unittests/cancelable-tasks-unittest.cc
@@ -180,7 +180,7 @@ TEST(CancelableTask, RemoveBeforeCancelAndWait) {
ResultType result1 = 0;
TestTask* task1 = new TestTask(&manager, &result1, TestTask::kCheckNotRun);
ThreadedRunner runner1(task1);
- uint32_t id = task1->id();
+ CancelableTaskManager::Id id = task1->id();
EXPECT_EQ(id, 1u);
EXPECT_TRUE(manager.TryAbort(id));
runner1.Start();
@@ -195,7 +195,7 @@ TEST(CancelableTask, RemoveAfterCancelAndWait) {
ResultType result1 = 0;
TestTask* task1 = new TestTask(&manager, &result1);
ThreadedRunner runner1(task1);
- uint32_t id = task1->id();
+ CancelableTaskManager::Id id = task1->id();
EXPECT_EQ(id, 1u);
runner1.Start();
runner1.Join();