Skip to content
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.

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

Issue in setting accessor in PathTypeHandlerWithAttr #6300

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/Runtime/Types/PathTypeHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,8 @@ namespace Js
}
}

Assert((attr & ObjectSlotAttr_Deleted) != ObjectSlotAttr_Deleted);

SetAttributesHelper(instance, propertyId, propertyIndex, attributes, (ObjectSlotAttributes)(attr | ObjectSlotAttr_Accessor));
// SetAttributesHelper can convert to dictionary in corner cases, e.g., if we haven't got a full path from the root. Remove this check when that's fixed.
if (!instance->GetTypeHandler()->IsPathTypeHandler())
Expand Down
20 changes: 20 additions & 0 deletions lib/Runtime/Types/SimpleTypeHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ namespace Js
}
}

if (HasDeletedProperties())
{
return false;
}

return true;
}

Expand Down Expand Up @@ -172,6 +177,21 @@ namespace Js
return newTypeHandler;
}

template<size_t size>
bool SimpleTypeHandler<size>::HasDeletedProperties()
{
for (PropertyIndex i = 0; i < propertyCount; i++)
{
if (descriptors[i].Attributes & PropertyDeleted)
{
return true;
}
}

return false;
}


template<size_t size>
PathTypeHandlerBase* SimpleTypeHandler<size>::ConvertToPathType(DynamicObject* instance)
{
Expand Down
2 changes: 2 additions & 0 deletions lib/Runtime/Types/SimpleTypeHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ namespace Js
ES5ArrayTypeHandler* ConvertToES5ArrayType(DynamicObject* instance);
SimpleTypeHandler<size>* ConvertToNonSharedSimpleType(DynamicObject * instance);

bool HasDeletedProperties();

BOOL GetDescriptor(PropertyId propertyId, PropertyIndex * index);
BOOL SetAttribute(DynamicObject* instance, PropertyIndex index, PropertyAttributes attribute);
BOOL ClearAttribute(DynamicObject* instance, PropertyIndex index, PropertyAttributes attribute);
Expand Down
27 changes: 27 additions & 0 deletions test/Bugs/bug_6271.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

function testReconfigureAsAccessorProperty(f) {
var length = 2;
Object.defineProperty(f, 'length', {
get: function () {
return length;
},
set: function (v) {
length = v;
}
});
}
(function testSetOnInstance() {
function f() {}
delete f.length;
testReconfigureAsAccessorProperty(f);
Object.defineProperty(Function.prototype, 'length', {
writable: true
});
f.length = 123;
f.length == 123 ? print("Pass") : print('fail');
})();

5 changes: 5 additions & 0 deletions test/Bugs/rlexe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,11 @@
<files>bug_6277.js</files>
</default>
</test>
<test>
<default>
<files>bug_6271.js</files>
</default>
</test>
<test>
<default>
<files>bug_OS23102586.js</files>
Expand Down