chakra-core
diff --git a/‎lib/Common/ConfigFlagsList.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/Common/ConfigFlagsList.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/Runtime/Language/JavascriptOperators.cpp
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎lib/Runtime/Language/JavascriptOperators.cpp
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎lib/Runtime/Library/JavascriptFunction.cpp
Copy file name to clipboard
+6-10Lines changed: 6 additions & 10 deletions b/‎lib/Runtime/Library/JavascriptFunction.cpp
Copy file name to clipboard
+6-10Lines changed: 6 additions & 10 deletions
diff --git a/‎lib/Runtime/Library/JavascriptLibrary.cpp
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎lib/Runtime/Library/JavascriptLibrary.cpp
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎test/es6/es6HasInstance.baseline
Copy file name to clipboard
-19Lines changed: 0 additions & 19 deletions b/‎test/es6/es6HasInstance.baseline
Copy file name to clipboard
-19Lines changed: 0 additions & 19 deletions
@@ -900,7 +900,7 @@ FLAGPR           (Boolean, ES6, ES6Unscopables         , "Enable ES6 With Statem
 FLAGPR           (Boolean, ES6, ES6RegExSticky         , "Enable ES6 RegEx sticky flag"                             , DEFAULT_CONFIG_ES6RegExSticky)
 FLAGPR_REGOVR_EXP(Boolean, ES6, ES6RegExPrototypeProperties, "Enable ES6 properties on the RegEx prototype"         , DEFAULT_CONFIG_ES6RegExPrototypeProperties)
 FLAGPR_REGOVR_EXP(Boolean, ES6, ES6RegExSymbols        , "Enable ES6 RegExp symbols"                                , DEFAULT_CONFIG_ES6RegExSymbols)
-FLAGPR           (Boolean, ES6, ES6HasInstance         , "Enable ES6 @@hasInstance symbol"                          , DEFAULT_CONFIG_ES6HasInstanceOf)
+FLAGPR_REGOVR_EXP(Boolean, ES6, ES6HasInstance         , "Enable ES6 @@hasInstance symbol"                          , DEFAULT_CONFIG_ES6HasInstanceOf)
 FLAGPR           (Boolean, ES6, ES6Verbose             , "Enable ES6 verbose trace"                                 , DEFAULT_CONFIG_ES6Verbose)
 FLAGPR_REGOVR_EXP(Boolean, ES6, ArrayBufferTransfer    , "Enable ArrayBuffer.transfer"                              , DEFAULT_CONFIG_ArrayBufferTransfer)
 // /ES6 (BLUE+1) features/flags
 
@@ -6998,7 +6998,8 @@ namespace Js
         if (scriptContext->GetConfig()->IsES6HasInstanceEnabled())
         {
             Var instOfHandler = JavascriptOperators::GetProperty(constructor, PropertyIds::_symbolHasInstance, scriptContext);
-            if (JavascriptOperators::IsUndefinedObject(instOfHandler))
+            if (JavascriptOperators::IsUndefinedObject(instOfHandler) 
+                || instOfHandler == scriptContext->GetBuiltInLibraryFunction(JavascriptFunction::EntryInfo::SymbolHasInstance.GetOriginalEntryPoint()))
             {
                 return JavascriptBoolean::ToVar(constructor->HasInstance(instance, scriptContext, inlineCache), scriptContext);
             }
 
@@ -2697,7 +2697,7 @@ namespace Js
 
         BOOL result = DynamicObject::SetProperty(propertyId, value, flags, info);
 
-        if (propertyId == PropertyIds::prototype)
+        if (propertyId == PropertyIds::prototype || propertyId == PropertyIds::_symbolHasInstance)
         {
             PropertyValueInfo::SetNoCache(info, this);
             InvalidateConstructorCacheOnPrototypeChange();
@@ -2711,7 +2711,7 @@ namespace Js
     {
         BOOL result = __super::SetPropertyWithAttributes(propertyId, value, attributes, info, flags, possibleSideEffects);
 
-        if (propertyId == PropertyIds::prototype)
+        if (propertyId == PropertyIds::prototype || propertyId == PropertyIds::_symbolHasInstance)
         {
             PropertyValueInfo::SetNoCache(info, this);
             InvalidateConstructorCacheOnPrototypeChange();
@@ -2759,7 +2759,7 @@ namespace Js
 
         BOOL result = DynamicObject::DeleteProperty(propertyId, flags);
 
-        if (result && propertyId == PropertyIds::prototype)
+        if (result && propertyId == PropertyIds::prototype || propertyId == PropertyIds::_symbolHasInstance)
         {
             InvalidateConstructorCacheOnPrototypeChange();
             this->GetScriptContext()->GetThreadContext()->InvalidateIsInstInlineCachesForFunction(this);
@@ -2976,18 +2976,14 @@ namespace Js
 
         Assert(!(callInfo.Flags & CallFlags_New));
 
-        if (args.Info.Count < 2)
-        {
-            JavascriptError::ThrowTypeError(scriptContext, JSERR_FunctionArgument_NeedObject, _u("Function[Symbol.hasInstance]"));
-        }
-
         RecyclableObject * constructor = RecyclableObject::FromVar(args[0]);
-        Var instance = args[1];
-        if (!JavascriptConversion::IsCallable(constructor))
+        if (!JavascriptConversion::IsCallable(constructor) || args.Info.Count < 2)
         {
             return JavascriptBoolean::ToVar(FALSE, scriptContext);
         }
 
+        Var instance = args[1];
+
         Assert(JavascriptProxy::Is(constructor) || JavascriptFunction::Is(constructor));
         return JavascriptBoolean::ToVar(constructor->HasInstance(instance, scriptContext, NULL), scriptContext);
     }
 
@@ -2547,6 +2547,7 @@ namespace Js
                                                      library->AddFunctionToLibraryObjectWithName(functionPrototype, PropertyIds::_symbolHasInstance, PropertyIds::_RuntimeFunctionNameId_hasInstance,
                                                                                                  &JavascriptFunction::EntryInfo::SymbolHasInstance, 1));
             functionPrototype->SetWritable(PropertyIds::_symbolHasInstance, false);
+            functionPrototype->SetConfigurable(PropertyIds::_symbolHasInstance, false);
         }
 
         DebugOnly(CheckRegisteredBuiltIns(builtinFuncs, scriptContext));
Original file line number	Diff line number	Diff line change
`@@ -6998,7 +6998,8 @@ namespace Js`
`6998`	`6998`	`if (scriptContext->GetConfig()->IsES6HasInstanceEnabled())`
`6999`	`6999`	`{`
`7000`	`7000`	`Var instOfHandler = JavascriptOperators::GetProperty(constructor, PropertyIds::_symbolHasInstance, scriptContext);`
`7001`		`- if (JavascriptOperators::IsUndefinedObject(instOfHandler))`
	`7001`	`+ if (JavascriptOperators::IsUndefinedObject(instOfHandler)`
	`7002`	`+ \|\| instOfHandler == scriptContext->GetBuiltInLibraryFunction(JavascriptFunction::EntryInfo::SymbolHasInstance.GetOriginalEntryPoint()))`
`7002`	`7003`	`{`
`7003`	`7004`	`return JavascriptBoolean::ToVar(constructor->HasInstance(instance, scriptContext, inlineCache), scriptContext);`
`7004`	`7005`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2697,7 +2697,7 @@ namespace Js`
`2697`	`2697`
`2698`	`2698`	`BOOL result = DynamicObject::SetProperty(propertyId, value, flags, info);`
`2699`	`2699`
`2700`		`- if (propertyId == PropertyIds::prototype)`
	`2700`	`+ if (propertyId == PropertyIds::prototype \|\| propertyId == PropertyIds::_symbolHasInstance)`
`2701`	`2701`	`{`
`2702`	`2702`	`PropertyValueInfo::SetNoCache(info, this);`
`2703`	`2703`	`InvalidateConstructorCacheOnPrototypeChange();`
`@@ -2711,7 +2711,7 @@ namespace Js`
`2711`	`2711`	`{`
`2712`	`2712`	`BOOL result = __super::SetPropertyWithAttributes(propertyId, value, attributes, info, flags, possibleSideEffects);`
`2713`	`2713`
`2714`		`- if (propertyId == PropertyIds::prototype)`
	`2714`	`+ if (propertyId == PropertyIds::prototype \|\| propertyId == PropertyIds::_symbolHasInstance)`
`2715`	`2715`	`{`
`2716`	`2716`	`PropertyValueInfo::SetNoCache(info, this);`
`2717`	`2717`	`InvalidateConstructorCacheOnPrototypeChange();`
`@@ -2759,7 +2759,7 @@ namespace Js`
`2759`	`2759`
`2760`	`2760`	`BOOL result = DynamicObject::DeleteProperty(propertyId, flags);`
`2761`	`2761`
`2762`		`- if (result && propertyId == PropertyIds::prototype)`
	`2762`	`+ if (result && propertyId == PropertyIds::prototype \|\| propertyId == PropertyIds::_symbolHasInstance)`
`2763`	`2763`	`{`
`2764`	`2764`	`InvalidateConstructorCacheOnPrototypeChange();`
`2765`	`2765`	`this->GetScriptContext()->GetThreadContext()->InvalidateIsInstInlineCachesForFunction(this);`
`@@ -2976,18 +2976,14 @@ namespace Js`
`2976`	`2976`
`2977`	`2977`	`Assert(!(callInfo.Flags & CallFlags_New));`
`2978`	`2978`
`2979`		`- if (args.Info.Count < 2)`
`2980`		`- {`
`2981`		`- JavascriptError::ThrowTypeError(scriptContext, JSERR_FunctionArgument_NeedObject, _u("Function[Symbol.hasInstance]"));`
`2982`		`- }`
`2983`		`-`
`2984`	`2979`	`RecyclableObject * constructor = RecyclableObject::FromVar(args[0]);`
`2985`		`- Var instance = args[1];`
`2986`		`- if (!JavascriptConversion::IsCallable(constructor))`
	`2980`	`+ if (!JavascriptConversion::IsCallable(constructor) \|\| args.Info.Count < 2)`
`2987`	`2981`	`{`
`2988`	`2982`	`return JavascriptBoolean::ToVar(FALSE, scriptContext);`
`2989`	`2983`	`}`
`2990`	`2984`
	`2985`	`+ Var instance = args[1];`
	`2986`	`+`
`2991`	`2987`	`Assert(JavascriptProxy::Is(constructor) \|\| JavascriptFunction::Is(constructor));`
`2992`	`2988`	`return JavascriptBoolean::ToVar(constructor->HasInstance(instance, scriptContext, NULL), scriptContext);`
`2993`	`2989`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2547,6 +2547,7 @@ namespace Js`
`2547`	`2547`	`library->AddFunctionToLibraryObjectWithName(functionPrototype, PropertyIds::_symbolHasInstance, PropertyIds::_RuntimeFunctionNameId_hasInstance,`
`2548`	`2548`	`&JavascriptFunction::EntryInfo::SymbolHasInstance, 1));`
`2549`	`2549`	`functionPrototype->SetWritable(PropertyIds::_symbolHasInstance, false);`
	`2550`	`+ functionPrototype->SetConfigurable(PropertyIds::_symbolHasInstance, false);`
`2550`	`2551`	`}`
`2551`	`2552`
`2552`	`2553`	`DebugOnly(CheckRegisteredBuiltIns(builtinFuncs, scriptContext));`