Skip to content

Allow strongRefHeapBlock to be nullptr #3591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Allow strongRefHeapBlock to be nullptr #3591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee06ac7
Adding test case for weak refs of tagged ints
kfarnung Aug 26, 2017
9d39667
Allow strongRefHeapBlock to be nullptr
kfarnung Aug 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions bin/NativeTests/JsRTApiTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,40 @@ namespace JsRTApiTest
JsRTApiTest::RunWithAttributes(JsRTApiTest::WeakReferenceTest);
}

void WeakReferenceTaggedIntTest(JsRuntimeAttributes attributes, JsRuntimeHandle runtime)
{
JsValueRef valueRef = JS_INVALID_REFERENCE;
REQUIRE(JsIntToNumber(25, &valueRef) == JsNoError);

JsWeakRef weakRef = JS_INVALID_REFERENCE;
REQUIRE(JsCreateWeakReference(valueRef, &weakRef) == JsNoError);

// JsGetWeakReferenceValue should return the original value reference.
JsValueRef valueRefFromWeakRef = JS_INVALID_REFERENCE;
CHECK(JsGetWeakReferenceValue(weakRef, &valueRefFromWeakRef) == JsNoError);
CHECK(valueRefFromWeakRef != JS_INVALID_REFERENCE);
CHECK(valueRefFromWeakRef == valueRef);

// Clear the references on the stack, so that the value will be GC'd.
valueRef = JS_INVALID_REFERENCE;
valueRefFromWeakRef = JS_INVALID_REFERENCE;

CHECK(JsCollectGarbage(runtime) == JsNoError);

// JsGetWeakReferenceValue should return the value even after a GC since
// it's not heap allocated.
REQUIRE(JsIntToNumber(25, &valueRef) == JsNoError);

JsValueRef valueRefAfterGC = JS_INVALID_REFERENCE;
CHECK(JsGetWeakReferenceValue(weakRef, &valueRefAfterGC) == JsNoError);
CHECK(valueRefAfterGC == valueRef);
}

TEST_CASE("ApiTest_WeakReferenceTaggedIntTest", "[ApiTest]")
{
JsRTApiTest::RunWithAttributes(JsRTApiTest::WeakReferenceTaggedIntTest);
}

void ObjectsAndPropertiesTest1(JsRuntimeAttributes attributes, JsRuntimeHandle runtime)
{
JsValueRef object = JS_INVALID_REFERENCE;
Expand Down
3 changes: 2 additions & 1 deletion lib/Common/Memory/Recycler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3118,7 +3118,8 @@ Recycler::SweepWeakReference()
return false;
}

if (!weakRef->strongRefHeapBlock->TestObjectMarkedBit(weakRef->strongRef))
if (weakRef->strongRefHeapBlock != nullptr &&
!weakRef->strongRefHeapBlock->TestObjectMarkedBit(weakRef->strongRef))
{
hasCleanup = true;
weakRef->strongRef = nullptr;
Expand Down
1 change: 0 additions & 1 deletion lib/Common/Memory/RecyclerWeakReference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ class WeakReferenceHashTable
entry = AllocatorNewBase(Recycler, recycler, AllocWeakReferenceEntry, RecyclerWeakReferenceBase);
entry->strongRef = strongReference;
entry->strongRefHeapBlock = recycler->FindHeapBlock(strongReference);
Assert(entry->strongRefHeapBlock != nullptr);

HeapBlock * weakRefHeapBlock = recycler->FindHeapBlock(entry);
Assert(!weakRefHeapBlock->IsLargeHeapBlock() || ((LargeHeapBlock*)weakRefHeapBlock)->InPageHeapMode());
Expand Down