[MERGE #5731 @yullin-ms] Implemented Math min and max as JsBuiltIns

Merge pull request #5731 from yullin-ms:mathMinMax

Implemented Math min and max as JsBuiltIns

Author: yullin-ms

lib/Runtime/Base/JnDirectFields.h

@@ -659,6 +659,8 @@ ENTRY(Array_every)
 ENTRY(Array_includes)
 ENTRY(Array_reduce)
 ENTRY(Object_fromEntries)
+ENTRY(Math_min)
+ENTRY(Math_max)
 ENTRY(FunctionKind)
 
 // EngineInterfaceObject built-ins
@@ -668,6 +670,8 @@ ENTRY(builtInJavascriptArrayEntryIndexOf)
 ENTRY(builtInJavascriptArrayEntrySome)
 ENTRY(builtInJavascriptArrayEntryEvery)
 ENTRY(builtInJavascriptArrayEntryIncludes)
+ENTRY(builtInMathMin)
+ENTRY(builtInMathMax)
 ENTRY(EngineInterface)
 ENTRY(builtInCallInstanceFunction)
 

lib/Runtime/ByteCode/ByteCodeCacheReleaseFileVersion.h

@@ -3,8 +3,7 @@
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 // NOTE: If there is a merge conflict the correct fix is to make a new GUID.
-// This file was generated with tools\update_bytecode_version.ps1
 
-// {9FAAF688-ACBA-4092-BA5B-77D97D3CD53A}
+// {D8913E7E-E430-4B28-81DD-EDD3EE5F263B}
 const GUID byteCodeCacheReleaseFileVersion =
-{ 0x9FAAF688, 0xACBA, 0x4092, { 0xBA, 0x5B, 0x77, 0xD9, 0x7D, 0x3C, 0xD5, 0x3A } };
+{ 0xD8913E7E, 0xE430, 0x4B28, { 0x81, 0xDD, 0xED, 0xD3, 0xEE, 0x5F, 0x26, 0x3B } };

lib/Runtime/Language/AsmJsBuiltInNames.h

@@ -4,6 +4,11 @@
 //-------------------------------------------------------------------------------------------------------
 
 // Default all macros to nothing
+
+#ifndef ASMJS_JSBUILTIN_MATH_FUNC_NAMES
+#define ASMJS_JSBUILTIN_MATH_FUNC_NAMES(propertyId, funcName)
+#endif
+
 #ifndef ASMJS_MATH_FUNC_NAMES
 #define ASMJS_MATH_FUNC_NAMES(name, propertyName, funcInfo)
 #endif
@@ -24,6 +29,11 @@
 #define ASMJS_TYPED_ARRAY_NAMES(name, propertyName) ASMJS_ARRAY_NAMES(name, propertyName)
 #endif
 
+#ifdef ENABLE_JS_BUILTINS
+ASMJS_JSBUILTIN_MATH_FUNC_NAMES(Js::PropertyIds::min,   Min     )
+ASMJS_JSBUILTIN_MATH_FUNC_NAMES(Js::PropertyIds::max,   Max     )
+#endif
+
 ASMJS_MATH_FUNC_NAMES(sin,      sin,    Math::EntryInfo::Sin    )
 ASMJS_MATH_FUNC_NAMES(cos,      cos,    Math::EntryInfo::Cos    )
 ASMJS_MATH_FUNC_NAMES(tan,      tan,    Math::EntryInfo::Tan    )
@@ -66,6 +76,7 @@ ASMJS_TYPED_ARRAY_NAMES(Float64Array, Float64Array)
 ASMJS_ARRAY_NAMES(byteLength,   byteLength)
 
 // help the caller to undefine all the macros
+#undef ASMJS_JSBUILTIN_MATH_FUNC_NAMES
 #undef ASMJS_MATH_FUNC_NAMES
 #undef ASMJS_MATH_CONST_NAMES
 #undef ASMJS_MATH_DOUBLE_CONST_NAMES

lib/Runtime/Language/AsmJsLink.cpp

@@ -191,6 +191,18 @@ namespace Js{
     bool ASMLink::CheckIsBuiltinFunction(ScriptContext* scriptContext, const Var object, PropertyId propertyId, const FunctionInfo& funcInfo)
     {
         Var mathFuncObj = JavascriptOperators::OP_GetProperty(object, propertyId, scriptContext);
+#ifdef ENABLE_JS_BUILTINS
+        if (scriptContext->IsJsBuiltInEnabled())
+        {
+            switch (propertyId)
+            {
+#define ASMJS_JSBUILTIN_MATH_FUNC_NAMES(propertyId, funcName) case propertyId: \
+                return VarIs<JavascriptFunction>(mathFuncObj) && \
+                    VarTo<JavascriptFunction>(mathFuncObj) == scriptContext->GetLibrary()->GetMath##funcName##Function();
+#include "AsmJsBuiltInNames.h"
+            }
+        }
+#endif
         return VarIs<JavascriptFunction>(mathFuncObj) &&
             VarTo<JavascriptFunction>(mathFuncObj)->GetFunctionInfo()->GetOriginalEntryPoint() == funcInfo.GetOriginalEntryPoint();
     }

lib/Runtime/Library/EngineInterfaceObjectBuiltIns.h

@@ -56,7 +56,6 @@ GlobalBuiltInConstructor(Symbol)
 
 GlobalMathBuiltIn(Abs)
 GlobalMathBuiltIn(Floor)
-GlobalMathBuiltIn(Max)
 GlobalMathBuiltIn(Pow)
 
 GlobalBuiltIn(JavascriptObject, DefineProperty)

lib/Runtime/Library/InJavascript/Intl.js.bc.32b.h

@@ -1876,7 +1876,6 @@ namespace Js
 
         /* No inlining            Array_Fill           */ library->AddFunctionToLibraryObject(arrayPrototype, PropertyIds::fill, &JavascriptArray::EntryInfo::Fill, 1);
         /* No inlining            Array_CopyWithin     */ library->AddFunctionToLibraryObject(arrayPrototype, PropertyIds::copyWithin, &JavascriptArray::EntryInfo::CopyWithin, 2);
-
         DebugOnly(CheckRegisteredBuiltIns(builtinFuncs, scriptContext));
 
         arrayPrototype->SetHasNoEnumerableProperties(true);
@@ -2860,6 +2859,18 @@ namespace Js
 
         Field(JavascriptFunction*)* builtinFuncs = library->GetBuiltinFunctions();
 
+#ifdef ENABLE_JS_BUILTINS
+        if (scriptContext->IsJsBuiltInEnabled())
+        {
+            library->EnsureBuiltInEngineIsReady();
+        }
+        else
+#endif
+        {
+            builtinFuncs[BuiltinFunction::Math_Max] = library->AddFunctionToLibraryObject(mathObject, PropertyIds::max, &Math::EntryInfo::Max, 2);
+            builtinFuncs[BuiltinFunction::Math_Min] = library->AddFunctionToLibraryObject(mathObject, PropertyIds::min, &Math::EntryInfo::Min, 2);
+        }
+
         builtinFuncs[BuiltinFunction::Math_Abs]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::abs,    &Math::EntryInfo::Abs,    1);
         builtinFuncs[BuiltinFunction::Math_Acos]   = library->AddFunctionToLibraryObject(mathObject, PropertyIds::acos,   &Math::EntryInfo::Acos,   1);
         builtinFuncs[BuiltinFunction::Math_Asin]   = library->AddFunctionToLibraryObject(mathObject, PropertyIds::asin,   &Math::EntryInfo::Asin,   1);
@@ -2870,8 +2881,6 @@ namespace Js
         builtinFuncs[BuiltinFunction::Math_Exp]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::exp,    &Math::EntryInfo::Exp,    1);
         builtinFuncs[BuiltinFunction::Math_Floor]  = library->AddFunctionToLibraryObject(mathObject, PropertyIds::floor,  &Math::EntryInfo::Floor,  1);
         builtinFuncs[BuiltinFunction::Math_Log]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::log,    &Math::EntryInfo::Log,    1);
-        builtinFuncs[BuiltinFunction::Math_Max]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::max,    &Math::EntryInfo::Max,    2);
-        builtinFuncs[BuiltinFunction::Math_Min]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::min,    &Math::EntryInfo::Min,    2);
         builtinFuncs[BuiltinFunction::Math_Pow]    = library->AddFunctionToLibraryObject(mathObject, PropertyIds::pow,    &Math::EntryInfo::Pow,    2);
         builtinFuncs[BuiltinFunction::Math_Random] = library->AddFunctionToLibraryObject(mathObject, PropertyIds::random, &Math::EntryInfo::Random, 0);
         builtinFuncs[BuiltinFunction::Math_Round]  = library->AddFunctionToLibraryObject(mathObject, PropertyIds::round,  &Math::EntryInfo::Round,  1);