Implement Object.hasOwn (#6726)

rhuanjl · web-flow · commit 312a878774b5 · 2021-07-03T16:43:02.000+01:00
diff --git a/lib/Backend/Inline.cpp b/lib/Backend/Inline.cpp
@@ -3813,6 +3813,10 @@ Inline::SetupInlineInstrForCallDirect(Js::BuiltinFunction builtInId, IR::Instr*
         callInstr->SetSrc1(IR::HelperCallOpnd::New(IR::JnHelperMethod::HelperObject_HasOwnProperty, callInstr->m_func));
         break;
 
+    case Js::BuiltinFunction::JavascriptObject_HasOwn:
+        callInstr->SetSrc1(IR::HelperCallOpnd::New(IR::JnHelperMethod::HelperObject_HasOwn, callInstr->m_func));
+        break;
+
     case Js::BuiltinFunction::JavascriptArray_IsArray:
         callInstr->SetSrc1(IR::HelperCallOpnd::New(IR::JnHelperMethod::HelperArray_IsArray, callInstr->m_func));
         break;
diff --git a/lib/Backend/InliningDecider.cpp b/lib/Backend/InliningDecider.cpp
@@ -540,6 +540,7 @@ bool InliningDecider::GetBuiltInInfoCommon(
 
     case Js::JavascriptBuiltInFunction::JavascriptArray_Includes:
     case Js::JavascriptBuiltInFunction::JavascriptObject_HasOwnProperty:
+    case Js::JavascriptBuiltInFunction::JavascriptObject_HasOwn:
     case Js::JavascriptBuiltInFunction::JavascriptArray_IsArray:
         *returnType = ValueType::Boolean;
         goto CallDirectCommon;
diff --git a/lib/Backend/JnHelperMethodList.h b/lib/Backend/JnHelperMethodList.h
@@ -525,6 +525,7 @@ HELPERCALL(String_PadStart, Js::JavascriptString::EntryPadStart, 0)
 HELPERCALL(String_PadEnd, Js::JavascriptString::EntryPadEnd, 0)
 HELPERCALLCHK(GlobalObject_ParseInt, Js::GlobalObject::EntryParseInt, 0)
 HELPERCALLCHK(Object_HasOwnProperty, Js::JavascriptObject::EntryHasOwnProperty, 0)
+HELPERCALLCHK(Object_HasOwn, Js::JavascriptObject::EntryHasOwn, 0)
 
 HELPERCALL(RegExp_SplitResultUsed, Js::RegexHelper::RegexSplitResultUsed, 0)
 HELPERCALL(RegExp_SplitResultUsedAndMayBeTemp, Js::RegexHelper::RegexSplitResultUsedAndMayBeTemp, 0)
diff --git a/lib/Runtime/Base/JnDirectFields.h b/lib/Runtime/Base/JnDirectFields.h
@@ -197,6 +197,7 @@ ENTRY(getUTCSeconds)
 ENTRY(getYear)
 ENTRY(has)
 ENTRY(hasInstance)
+ENTRY(hasOwn)
 ENTRY(hasOwnProperty)
 ENTRY(includes)
 ENTRY(indexOf)
diff --git a/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h b/lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h
@@ -6,7 +6,7 @@
 // NOTE: If there is a merge conflict the correct fix is to make a new GUID.
 // This file was generated with tools/regenByteCode.py
 
-// {7e624f04-e6a9-408a-9a53-d067a2b1c80e}
+// {0758006c-1750-4081-b107-c08101300fac}
 const GUID byteCodeCacheReleaseFileVersion =
-{ 0x7e624f04, 0xe6a9, 0x408a, {0x9a, 0x53, 0xd0, 0x67, 0xa2, 0xb1, 0xc8, 0x0e } };
+{ 0x0758006c, 0x1750, 0x4081, {0xb1, 0x07, 0xc0, 0x81, 0x01, 0x30, 0x0f, 0xac } };
 
diff --git a/lib/Runtime/Library/InJavascript/JsBuiltIn.bc.32b.h b/lib/Runtime/Library/InJavascript/JsBuiltIn.bc.32b.h
diff --git a/lib/Runtime/Library/InJavascript/JsBuiltIn.bc.64b.h b/lib/Runtime/Library/InJavascript/JsBuiltIn.bc.64b.h
diff --git a/lib/Runtime/Library/InJavascript/JsBuiltIn.nojit.bc.32b.h b/lib/Runtime/Library/InJavascript/JsBuiltIn.nojit.bc.32b.h
diff --git a/lib/Runtime/Library/InJavascript/JsBuiltIn.nojit.bc.64b.h b/lib/Runtime/Library/InJavascript/JsBuiltIn.nojit.bc.64b.h
diff --git a/lib/Runtime/Library/JavascriptBuiltInFunctionList.h b/lib/Runtime/Library/JavascriptBuiltInFunctionList.h
@@ -174,6 +174,7 @@ BUILTIN(JavascriptNumber, ValueOf, EntryValueOf, FunctionInfo::ErrorOnNew | Func
 BUILTIN(JavascriptObject, NewInstance, NewInstance, FunctionInfo::SkipDefaultNewObject)
 BUILTIN(JavascriptObject, HasOwnProperty, EntryHasOwnProperty, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptObject, PropertyIsEnumerable, EntryPropertyIsEnumerable, FunctionInfo::ErrorOnNew)
+BUILTIN(JavascriptObject, HasOwn, EntryHasOwn, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptObject, IsPrototypeOf, EntryIsPrototypeOf, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptObject, ToLocaleString, EntryToLocaleString, FunctionInfo::ErrorOnNew)
 BUILTIN(JavascriptObject, ToString, EntryToString, FunctionInfo::ErrorOnNew | FunctionInfo::HasNoSideEffect)
diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -3876,6 +3876,9 @@ namespace Js
         case PropertyIds::hasOwnProperty:
             return BuiltinFunction::JavascriptObject_HasOwnProperty;
 
+        case PropertyIds::hasOwn:
+            return BuiltinFunction::JavascriptObject_HasOwn;
+
         default:
             return BuiltinFunction::None;
         }
@@ -4129,7 +4132,7 @@ namespace Js
         // so that the update is in sync with profiler
         JavascriptLibrary* library = objectConstructor->GetLibrary();
         ScriptContext* scriptContext = objectConstructor->GetScriptContext();
-        int propertyCount = 18;
+        int propertyCount = 19;
         if (scriptContext->GetConfig()->IsES6ObjectExtensionsEnabled())
         {
             propertyCount += 2;
@@ -4208,6 +4211,9 @@ namespace Js
                 library->AddFunctionToLibraryObject(objectConstructor, PropertyIds::entries, &JavascriptObject::EntryInfo::Entries, 1));
         }
 
+        scriptContext->SetBuiltInLibraryFunction(JavascriptObject::EntryInfo::HasOwn.GetOriginalEntryPoint(),
+            library->AddFunctionToLibraryObject(objectConstructor, PropertyIds::hasOwn, &JavascriptObject::EntryInfo::HasOwn, 2));
+
 #ifdef ENABLE_JS_BUILTINS
         if (scriptContext->IsJsBuiltInEnabled())
         {
@@ -7505,7 +7511,7 @@ namespace Js
         return hr;
     }
 
-     HRESULT JavascriptLibrary::ProfilerRegisterObject()
+    HRESULT JavascriptLibrary::ProfilerRegisterObject()
     {
         HRESULT hr = S_OK;
 
@@ -7537,6 +7543,7 @@ namespace Js
 
         REG_OBJECTS_LIB_FUNC(getOwnPropertySymbols, JavascriptObject::EntryGetOwnPropertySymbols);
 
+        REG_OBJECTS_LIB_FUNC(hasOwn, JavascriptObject::EntryHasOwn);
         REG_OBJECTS_LIB_FUNC(hasOwnProperty, JavascriptObject::EntryHasOwnProperty);
         REG_OBJECTS_LIB_FUNC(propertyIsEnumerable, JavascriptObject::EntryPropertyIsEnumerable);
         REG_OBJECTS_LIB_FUNC(isPrototypeOf, JavascriptObject::EntryIsPrototypeOf);
diff --git a/lib/Runtime/Library/JavascriptObject.cpp b/lib/Runtime/Library/JavascriptObject.cpp
@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #include "RuntimeLibraryPch.h"
@@ -93,6 +94,40 @@ Var JavascriptObject::EntryHasOwnProperty(RecyclableObject* function, CallInfo c
     JIT_HELPER_END(Object_HasOwnProperty);
 }
 
+Var JavascriptObject::EntryHasOwn(RecyclableObject* function, CallInfo callInfo, ...)
+{
+    JIT_HELPER_REENTRANT_HEADER(Object_HasOwn);
+    PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
+
+    ARGUMENTS(args, callInfo);
+    ScriptContext* scriptContext = function->GetScriptContext();
+
+    Assert(!(callInfo.Flags & CallFlags_New));
+
+    RecyclableObject* dynamicObject = nullptr;
+    // first parameter must exist and be an object coercible or throw type error
+    if (args.Info.Count < 2 || FALSE == JavascriptConversion::ToObject(args[1], scriptContext, &dynamicObject))
+    {
+        JavascriptError::ThrowTypeError(scriptContext, JSERR_FunctionArgument_NeedObject, _u("Object.hasOwn"));
+    }
+
+    // if there is only one parameter use undefined as the property to query
+    Var propertyName = args.Info.Count == 2 ? scriptContext->GetLibrary()->GetUndefined() : args[2];
+
+    const PropertyRecord* propertyRecord;
+    PropertyString* propertyString;
+    JavascriptConversion::ToPropertyKey(propertyName, scriptContext, &propertyRecord, &propertyString);
+
+    if (JavascriptOperators::HasOwnProperty(dynamicObject, propertyRecord->GetPropertyId(), scriptContext, propertyString))
+    {
+        return scriptContext->GetLibrary()->GetTrue();
+    }
+
+    return scriptContext->GetLibrary()->GetFalse();
+    JIT_HELPER_END(Object_HasOwn);
+}
+
+
 Var JavascriptObject::EntryPropertyIsEnumerable(RecyclableObject* function, CallInfo callInfo, ...)
 {
     PROBE_STACK(function->GetScriptContext(), Js::Constants::MinStackDefault);
diff --git a/lib/Runtime/Library/JavascriptObject.h b/lib/Runtime/Library/JavascriptObject.h
@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #pragma once
@@ -21,6 +22,7 @@ namespace Js
         public:
             static FunctionInfo NewInstance;
             static FunctionInfo HasOwnProperty;
+            static FunctionInfo HasOwn;
             static FunctionInfo PropertyIsEnumerable;
             static FunctionInfo IsPrototypeOf;
             static FunctionInfo ToLocaleString;
@@ -54,6 +56,7 @@ namespace Js
 
         static Var NewInstance(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryHasOwnProperty(RecyclableObject* function, CallInfo callInfo, ...);
+        static Var EntryHasOwn(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryPropertyIsEnumerable(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryIsPrototypeOf(RecyclableObject* function, CallInfo callInfo, ...);
         static Var EntryToLocaleString(RecyclableObject* function, CallInfo callInfo, ...);
diff --git a/lib/Runtime/LibraryFunction.h b/lib/Runtime/LibraryFunction.h
@@ -84,5 +84,6 @@ LIBRARY_FUNCTION(Math,          Fround,             1,    BIF_TypeSpecUnaryToFlo
 LIBRARY_FUNCTION(JavascriptString,        PadStart,           2,    BIF_UseSrc0 | BIF_VariableArgsNumber                  , JavascriptString::EntryInfo::PadStart)
 LIBRARY_FUNCTION(JavascriptString,        PadEnd,             2,    BIF_UseSrc0 | BIF_VariableArgsNumber                  , JavascriptString::EntryInfo::PadEnd)
 LIBRARY_FUNCTION(JavascriptObject,        HasOwnProperty,     2,    BIF_UseSrc0                                           , JavascriptObject::EntryInfo::HasOwnProperty)
+LIBRARY_FUNCTION(JavascriptObject,        HasOwn,             3,    BIF_None                                              , JavascriptObject::EntryInfo::HasOwn)
 
 // Note: 1st column is currently used only for debug tracing.
diff --git a/test/DebuggerCommon/ES6_intl_simple_attach.js.dbg.baseline b/test/DebuggerCommon/ES6_intl_simple_attach.js.dbg.baseline
@@ -42,6 +42,7 @@
               "getOwnPropertyDescriptor": "function <large string>",
               "getOwnPropertyDescriptors": "function <large string>",
               "defineProperties": "function <large string>",
+              "hasOwn": "function <large string>",
               "create": "function <large string>",
               "seal": "function <large string>",
               "freeze": "function <large string>",
@@ -191,6 +192,7 @@
               "getOwnPropertyDescriptor": "function <large string>",
               "getOwnPropertyDescriptors": "function <large string>",
               "defineProperties": "function <large string>",
+              "hasOwn": "function <large string>",
               "create": "function <large string>",
               "seal": "function <large string>",
               "freeze": "function <large string>",
@@ -340,6 +342,7 @@
               "getOwnPropertyDescriptor": "function <large string>",
               "getOwnPropertyDescriptors": "function <large string>",
               "defineProperties": "function <large string>",
+              "hasOwn": "function <large string>",
               "create": "function <large string>",
               "seal": "function <large string>",
               "freeze": "function <large string>",
diff --git a/test/DebuggerCommon/symbols.js.dbg.baseline b/test/DebuggerCommon/symbols.js.dbg.baseline
@@ -16,6 +16,7 @@
                 "defineProperty": "function <large string>",
                 "getOwnPropertyDescriptor": "function <large string>",
                 "getOwnPropertyDescriptors": "function <large string>",
+                "hasOwn": "function <large string>",
                 "defineProperties": "function <large string>",
                 "create": "function <large string>",
                 "seal": "function <large string>",
diff --git a/test/Object/hasOwnProperty.baseline b/test/Object/hasOwnProperty.baseline
diff --git a/test/Object/hasOwnProperty.js b/test/Object/hasOwnProperty.js
@@ -1,10 +1,9 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 
-function write(v) { WScript.Echo(v + ""); }
-
 function obj() { return this; }
 
 var z = obj();
@@ -16,35 +15,50 @@ a.x  = 200;
 o.x  = 300;
 a.some = undefined;
 
-write("------------ hasOwnProperty ------------");
 
-write(o.hasOwnProperty("x"));
-write(o.hasOwnProperty("y"));
-write(o.hasOwnProperty(""));
-write(o.hasOwnProperty());
+const cases = [
+    [o, "x", true],
+    [o, "y", false],
+    [o, "", false],
+    [o, , false],
 
-write(a.hasOwnProperty(0));
-write(a.hasOwnProperty(1));
-write(a.hasOwnProperty(2));
-write(a.hasOwnProperty(3));
+    [a, 0, true],
+    [a, 1, true],
+    [a, 2, true],
+    [a, 3, false],
+    [a, "0", true],
+    [a, "1", true],
+    [a, "2", true],
+    [a, "3", false],
+    [a, "x", true],
+    [a, "some", true],
+    [a, "y", false],
+    [a, "", false],
+    [a, "length", true],
+    [a, , false],
+    [a, o, true],
+    [a, "o", false],
+    [a, "[object Object]", true],
 
-write(a.hasOwnProperty("0"));
-write(a.hasOwnProperty("1"));
-write(a.hasOwnProperty("2"));
-write(a.hasOwnProperty("3"));
+    [z, , true],
+    [z, undefined, true]
+];
 
-write(a.hasOwnProperty("x"));
-write(a.hasOwnProperty("some"));
-write(a.hasOwnProperty("y"));
-write(a.hasOwnProperty(""));
+function assert (result, message) {
+    if (!result) {
+        throw new Error (message);
+    }
+}
 
-write(a.hasOwnProperty("length"));
 
-write(a.hasOwnProperty());
+for (let i = 0; i < cases.length; ++i) {
+    let test = cases[i];
+    assert (test[0].hasOwnProperty(test[1]) === test[2], `${test[0]}.hasOwnProperty(${test[1]}) should equal ${test[2]}`);
+    assert (Object.hasOwn(test[0], test[1]) === test[2], `Object.hasOwn(${test[0]}, ${test[1]}) should equal ${test[2]}`);
+}
 
-write(a.hasOwnProperty(o));
-write(a.hasOwnProperty("o"));
-write(a.hasOwnProperty("[object Object]")); 
+assert(Object.hasOwn.length === 2, "Object.hasOwn.length should equal 2");
+assert(Object.prototype.hasOwnProperty.length === 1, "Object.prototype.hasOwnProperty.length should equal 1");
+assert(!Object.prototype.hasOwn, "Object.prototype.hasOwn should not exist");
 
-write(z.hasOwnProperty());
-write(z.hasOwnProperty(undefined));
+print("pass");
diff --git a/test/Object/rlexe.xml b/test/Object/rlexe.xml
@@ -21,7 +21,6 @@
   <test>
     <default>
       <files>hasOwnProperty.js</files>
-      <baseline>hasOwnProperty.baseline</baseline>
     </default>
   </test>
   <test>
