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.

Sign up for GitHub

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

Jump to bottom

ChakraCore Servicing Update for 2020.05B #6447

Merged
merged 3 commits into from
May 12, 2020
Merged

ChakraCore Servicing Update for 2020.05B #6447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e245029
[CVE-2020-1065] A previous MSRC fix removes the body scope of an encl…
anagoyal Apr 16, 2020
73ced02
[CVE-2020-1037] Ensure JIT bails out when there is an object marked a…
Apr 10, 2020
7af2bf2
Updated version to 1.11.19
rajeshpeter May 12, 2020
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: 1 addition & 1 deletion Build/NuGet/.pack-version
View file
Open in desktop
@@ -1 +1 @@
1.11.18
1.11.19
3 changes: 2 additions & 1 deletion lib/Backend/GlobOptBailOut.cpp
View file
Open in desktop
Expand Up @@ -1204,7 +1204,8 @@ GlobOpt::IsImplicitCallBailOutCurrentlyNeeded(IR::Instr * instr, Value const * s
NeedBailOnImplicitCallForLiveValues(block, isForwardPass) ||
NeedBailOnImplicitCallForCSE(block, isForwardPass) ||
NeedBailOnImplicitCallWithFieldOpts(block->loop, hasLiveFields) ||
NeedBailOnImplicitCallForArrayCheckHoist(block, isForwardPass)
NeedBailOnImplicitCallForArrayCheckHoist(block, isForwardPass) ||
(instr->HasBailOutInfo() && (instr->GetBailOutKind() & IR::BailOutMarkTempObject) != 0)
) &&
(!instr->HasTypeCheckBailOut() && MayNeedBailOnImplicitCall(instr, src1Val, src2Val)))
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Common/ChakraCoreVersion.h
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
// ChakraCore version number definitions (used in ChakraCore binary metadata)
#define CHAKRA_CORE_MAJOR_VERSION 1
#define CHAKRA_CORE_MINOR_VERSION 11
#define CHAKRA_CORE_PATCH_VERSION 18
#define CHAKRA_CORE_PATCH_VERSION 19
#define CHAKRA_CORE_VERSION_RELEASE_QFE 0 // Redundant with PATCH_VERSION. Keep this value set to 0.

// -------------
Expand Down
17 changes: 17 additions & 0 deletions lib/Runtime/ByteCode/ScopeInfo.cpp
View file
Open in desktop
Expand Up @@ -194,6 +194,23 @@ namespace Js
ScopeInfo * scopeInfo = ScopeInfo::SaveScopeInfo(byteCodeGenerator, currentScope, byteCodeGenerator->GetScriptContext());
if (scopeInfo != nullptr)
{
if (funcInfo->root->IsDeclaredInParamScope())
{
FuncInfo* func = byteCodeGenerator->GetEnclosingFuncInfo();
Assert(func);

if (func->IsBodyAndParamScopeMerged())
{
Assert(currentScope == func->GetParamScope() && currentScope->GetScopeType() == ScopeType_Parameter);
Assert(scopeInfo->GetScopeType() == ScopeType_Parameter);
Assert(func->GetBodyScope());

// If the current function is nested in the param scope of it's enclosing function we may have
// skipped the body scope and in may not be the scope stack but the body scope might still be
// in the frame display and we will need to account for it. See ByteCodeGenerateor::FindScopeForSym.
scopeInfo->mustInstantiate = func->GetBodyScope()->GetMustInstantiate();
}
}
funcInfo->byteCodeFunction->SetScopeInfo(scopeInfo);
}
}
Expand Down