Remove -ES6Unscopables feature switch

Re issue chakra-core#6
ianwjhalliday · Feb 11, 2016 · b142f22 · b142f22
1 parent b855430
commit b142f22
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 43 deletions.
diff --git a/lib/Runtime/Base/ThreadConfigFlagsList.h b/lib/Runtime/Base/ThreadConfigFlagsList.h
@@ -32,7 +32,6 @@ FLAG_RELEASE(IsES6ToLengthEnabled, ES6ToLength)
 FLAG_RELEASE(IsES6ToStringTagEnabled, ES6ToStringTag)
 FLAG_RELEASE(IsES6TypedArrayExtensionsEnabled, ES6TypedArrayExtensions)
 FLAG_RELEASE(IsES6UnicodeExtensionsEnabled, ES6Unicode)
-FLAG_RELEASE(IsES6UnscopablesEnabled, ES6Unscopables)
 FLAG_RELEASE(IsES6RegExStickyEnabled, ES6RegExSticky)
 FLAG_RELEASE(IsES6RegExPrototypePropertiesEnabled, ES6RegExPrototypeProperties)
 FLAG_RELEASE(IsES6RegExSymbolsEnabled, ES6RegExSymbols)

diff --git a/lib/Runtime/ByteCode/ByteCodeEmitter.cpp b/lib/Runtime/ByteCode/ByteCodeEmitter.cpp
@@ -4178,7 +4178,7 @@ void ByteCodeGenerator::EmitLoadInstance(Symbol *sym, IdentPtr pid, Js::RegSlot
         Js::ByteCodeLabel nextLabel = this->m_writer.DefineLabel();
         Js::PropertyId propertyId = sym ? sym->EnsurePosition(this) : pid->GetPropertyId();
 
-        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With && scriptContext->GetConfig()->IsES6UnscopablesEnabled();
+        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With;
         if (envIndex != -1)
         {
             this->m_writer.BrEnvProperty(
@@ -4530,7 +4530,7 @@ void ByteCodeGenerator::EmitPropStore(Js::RegSlot rhsLocation, Symbol *sym, Iden
         Js::PropertyId propertyId = sym ? sym->EnsurePosition(this) : pid->GetPropertyId();
 
         Js::RegSlot unwrappedScopeLocation = scopeLocation;
-        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With && scriptContext->GetConfig()->IsES6UnscopablesEnabled();
+        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With;
         if (envIndex != -1)
         {
             this->m_writer.BrEnvProperty(
@@ -4804,7 +4804,7 @@ void ByteCodeGenerator::EmitPropLoad(Js::RegSlot lhsLocation, Symbol *sym, Ident
         Js::PropertyId propertyId = sym ? sym->EnsurePosition(this) : pid->GetPropertyId();
 
         Js::RegSlot unwrappedScopeLocation = Js::Constants::NoRegister;
-        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With && scriptContext->GetConfig()->IsES6UnscopablesEnabled();
+        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With;
         if (envIndex != -1)
         {
             this->m_writer.BrEnvProperty(
@@ -5046,7 +5046,7 @@ void ByteCodeGenerator::EmitPropDelete(Js::RegSlot lhsLocation, Symbol *sym, Ide
 
         Js::ByteCodeLabel nextLabel = this->m_writer.DefineLabel();
         Js::PropertyId propertyId = sym ? sym->EnsurePosition(this) : pid->GetPropertyId();
-        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With && scriptContext->GetConfig()->IsES6UnscopablesEnabled();
+        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With;
         if (envIndex != -1)
         {
             this->m_writer.BrEnvProperty(
@@ -5208,7 +5208,7 @@ void ByteCodeGenerator::EmitPropTypeof(Js::RegSlot lhsLocation, Symbol *sym, Ide
         Js::ByteCodeLabel nextLabel = this->m_writer.DefineLabel();
         Js::PropertyId propertyId = sym ? sym->EnsurePosition(this) : pid->GetPropertyId();
 
-        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With && scriptContext->GetConfig()->IsES6UnscopablesEnabled();
+        bool unwrapWithObj = scope->GetScopeType() == ScopeType_With;
         if (envIndex != -1)
         {
             this->m_writer.BrEnvProperty(Js::OpCode::BrOnNoEnvProperty, nextLabel,
@@ -10338,12 +10338,9 @@ void Emit(ParseNode *pnode, ByteCodeGenerator *byteCodeGenerator, FuncInfo *func
         funcInfo->AcquireLoc(pnode);
         Emit(pnode->sxWith.pnodeObj, byteCodeGenerator, funcInfo, false);
 
-        Js::RegSlot regVal = (byteCodeGenerator->GetScriptContext()->GetConfig()->IsES6UnscopablesEnabled()) ? funcInfo->AcquireTmpRegister() : pnode->location;
+        Js::RegSlot regVal = funcInfo->AcquireTmpRegister();
         byteCodeGenerator->Writer()->Reg2(Js::OpCode::Conv_Obj, regVal, pnode->sxWith.pnodeObj->location);
-        if (byteCodeGenerator->GetScriptContext()->GetConfig()->IsES6UnscopablesEnabled())
-        {
-            byteCodeGenerator->Writer()->Reg2(Js::OpCode::NewWithObject, pnode->location, regVal);
-        }
+        byteCodeGenerator->Writer()->Reg2(Js::OpCode::NewWithObject, pnode->location, regVal);
         byteCodeGenerator->EndStatement(pnode);
 
 #ifdef PERF_HINT
@@ -10375,10 +10372,7 @@ void Emit(ParseNode *pnode, ByteCodeGenerator *byteCodeGenerator, FuncInfo *func
         {
             byteCodeGenerator->Writer()->MarkLabel(pnode->sxStmt.breakLabel);
         }
-        if (byteCodeGenerator->GetScriptContext()->GetConfig()->IsES6UnscopablesEnabled())
-        {
-            funcInfo->ReleaseTmpRegister(regVal);
-        }
+        funcInfo->ReleaseTmpRegister(regVal);
         funcInfo->ReleaseLoc(pnode->sxWith.pnodeObj);
         break;
     }

diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -560,7 +560,6 @@ namespace Js
         uriErrorType = DynamicType::New(scriptContext, TypeIds_Error, uriErrorPrototype, nullptr,
             SimplePathTypeHandler::New(scriptContext, scriptContext->GetRootPath(), 0, 0, 0, true, true), true, true);
 
-        withType    = nullptr;
         proxyType   = nullptr;
         javascriptEnumeratorIteratorType = nullptr;
 
@@ -572,10 +571,7 @@ namespace Js
         symbolTypeStatic = StaticType::New(scriptContext, TypeIds_Symbol, symbolPrototype, nullptr);
         symbolTypeDynamic = DynamicType::New(scriptContext, TypeIds_SymbolObject, symbolPrototype, nullptr, NullTypeHandler<false>::GetDefaultInstance(), true, true);
 
-        if (config->IsES6UnscopablesEnabled())
-        {
-            withType = StaticType::New(scriptContext, TypeIds_WithScopeObject, GetNull(), nullptr);
-        }
+        withType = StaticType::New(scriptContext, TypeIds_WithScopeObject, GetNull(), nullptr);
 
         if (config->IsES6SpreadEnabled())
         {
@@ -1650,19 +1646,16 @@ namespace Js
         /* No inlining                Array_Values         */ library->AddMember(arrayPrototype, PropertyIds::values, values);
         /* No inlining                Array_SymbolIterator */ library->AddMember(arrayPrototype, PropertyIds::_symbolIterator, values);
 
-        if (scriptContext->GetConfig()->IsES6UnscopablesEnabled())
-        {
-            DynamicType* dynamicType = DynamicType::New(scriptContext, TypeIds_Object, library->nullValue, nullptr, NullTypeHandler<false>::GetDefaultInstance(), false);
-            DynamicObject* unscopables_blacklist = DynamicObject::New(library->GetRecycler(), dynamicType);
-            unscopables_blacklist->SetProperty(PropertyIds::find, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::findIndex, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::fill, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::copyWithin, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::entries, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::keys, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            unscopables_blacklist->SetProperty(PropertyIds::values, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
-            library->AddMember(arrayPrototype, PropertyIds::_symbolUnscopables, unscopables_blacklist, PropertyConfigurable);
-        }
+        DynamicObject* unscopables_blacklist = DynamicObject::New(library->GetRecycler(),
+            DynamicType::New(scriptContext, TypeIds_Object, library->nullValue, nullptr, NullTypeHandler<false>::GetDefaultInstance(), false));
+        unscopables_blacklist->SetProperty(PropertyIds::find, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::findIndex, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::fill, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::copyWithin, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::entries, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::keys, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        unscopables_blacklist->SetProperty(PropertyIds::values, JavascriptBoolean::ToVar(true, scriptContext), PropertyOperation_None, nullptr);
+        library->AddMember(arrayPrototype, PropertyIds::_symbolUnscopables, unscopables_blacklist, PropertyConfigurable);
 
         if (scriptContext->GetConfig()->IsES6TypedArrayExtensionsEnabled()) // This is not a typo, Array.prototype.fill and .copyWithin are part of the ES6 TypedArray feature
         {

diff --git a/lib/common/ConfigFlagsList.h b/lib/common/ConfigFlagsList.h
@@ -495,7 +495,6 @@ PHASE(All)
 #define DEFAULT_CONFIG_ES6TypedArrayExtensions (true)
 #define DEFAULT_CONFIG_ES6Unicode              (true)
 #define DEFAULT_CONFIG_ES6UnicodeVerbose       (true)
-#define DEFAULT_CONFIG_ES6Unscopables          (true)
 #define DEFAULT_CONFIG_ES6RegExSticky          (true)
 #define DEFAULT_CONFIG_ES6RegExPrototypeProperties (false)
 #define DEFAULT_CONFIG_ES6RegExSymbols         (false)
@@ -873,7 +872,6 @@ FLAGPR           (Boolean, ES6, ES6ToStringTag         , "Enable ES6 ToStringTag
 FLAGPR           (Boolean, ES6, ES6TypedArrayExtensions, "Enable ES6 TypedArray extensions"                         , DEFAULT_CONFIG_ES6TypedArrayExtensions)
 FLAGPR           (Boolean, ES6, ES6Unicode             , "Enable ES6 Unicode 6.0 extensions"                        , DEFAULT_CONFIG_ES6Unicode)
 FLAGPR           (Boolean, ES6, ES6UnicodeVerbose      , "Enable ES6 Unicode 6.0 verbose failure output"            , DEFAULT_CONFIG_ES6UnicodeVerbose)
-FLAGPR           (Boolean, ES6, ES6Unscopables         , "Enable ES6 With Statement Unscopables"                    , DEFAULT_CONFIG_ES6Unscopables)
 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)

diff --git a/test/es6/es6_all.baseline b/test/es6/es6_all.baseline
@@ -53,8 +53,6 @@ FLAG ES6 = 1 - setting child flag ES6Unicode = 1
 FLAG ES6Unicode = 1
 FLAG ES6 = 1 - setting child flag ES6UnicodeVerbose = 1
 FLAG ES6UnicodeVerbose = 1
-FLAG ES6 = 1 - setting child flag ES6Unscopables = 1
-FLAG ES6Unscopables = 1
 FLAG ES6 = 1 - setting child flag ES6RegExSticky = 1
 FLAG ES6RegExSticky = 1
 FLAG ES6 = 1 - setting child flag ES6RegExPrototypeProperties = 1

diff --git a/test/es6/es6_stable.baseline b/test/es6/es6_stable.baseline
@@ -53,8 +53,6 @@ FLAG ES6 = 1 - setting child flag ES6Unicode = 1
 FLAG ES6Unicode = 1
 FLAG ES6 = 1 - setting child flag ES6UnicodeVerbose = 1
 FLAG ES6UnicodeVerbose = 1
-FLAG ES6 = 1 - setting child flag ES6Unscopables = 1
-FLAG ES6Unscopables = 1
 FLAG ES6 = 1 - setting child flag ES6RegExSticky = 1
 FLAG ES6RegExSticky = 1
 FLAG ES6 = 1 - setting child flag ES6RegExPrototypeProperties = 0

diff --git a/test/es6/es6_stable.enable_disable.baseline b/test/es6/es6_stable.enable_disable.baseline
@@ -53,8 +53,6 @@ FLAG ES6 = 1 - setting child flag ES6Unicode = 1
 FLAG ES6Unicode = 1
 FLAG ES6 = 1 - setting child flag ES6UnicodeVerbose = 1
 FLAG ES6UnicodeVerbose = 1
-FLAG ES6 = 1 - setting child flag ES6Unscopables = 1
-FLAG ES6Unscopables = 1
 FLAG ES6 = 1 - setting child flag ES6RegExSticky = 1
 FLAG ES6RegExSticky = 1
 FLAG ES6 = 1 - setting child flag ES6RegExPrototypeProperties = 0
@@ -122,8 +120,6 @@ FLAG ES6 = 0 - setting child flag ES6Unicode = 0
 FLAG ES6Unicode = 0
 FLAG ES6 = 0 - setting child flag ES6UnicodeVerbose = 0
 FLAG ES6UnicodeVerbose = 0
-FLAG ES6 = 0 - setting child flag ES6Unscopables = 0
-FLAG ES6Unscopables = 0
 FLAG ES6 = 0 - setting child flag ES6RegExSticky = 0
 FLAG ES6RegExSticky = 0
 FLAG ES6 = 0 - setting child flag ES6RegExPrototypeProperties = 0