Skip to content

Revert the original fix to 5424307 #2

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

Merged
chakrabot merged 1 commit into from
Jan 6, 2016
Merged

Revert the original fix to 5424307 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions lib/Runtime/ByteCode/ByteCodeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5593,14 +5593,19 @@ void EmitReference(ParseNode *pnode, ByteCodeGenerator *byteCodeGenerator, FuncI
case knopName:
{
Symbol *sym = pnode->sxCall.pnodeTarget->sxPid.sym;
if (!sym ||
sym->GetLocation() == Js::Constants::NoRegister ||
sym->IsInSlot(funcInfo) ||
sym->GetScope()->GetFunc() != funcInfo)
if (!sym || sym->GetLocation() == Js::Constants::NoRegister)
{
funcInfo->AcquireLoc(pnode->sxCall.pnodeTarget);
}
EmitReference(pnode->sxCall.pnodeTarget, byteCodeGenerator, funcInfo);
if (sym && (sym->IsInSlot(funcInfo) || sym->GetScope()->GetFunc() != funcInfo))
{
// Can't get the value from the assigned register, so load it here.
EmitLoad(pnode->sxCall.pnodeTarget, byteCodeGenerator, funcInfo);
}
else
{
EmitReference(pnode->sxCall.pnodeTarget, byteCodeGenerator, funcInfo);
}
break;
}
default:
Expand Down
4 changes: 2 additions & 2 deletions test/LetConst/tdz1.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ ReferenceError: Use before declaration
ReferenceError: Use before declaration
ReferenceError: Use before declaration
ReferenceError: Use before declaration
ReferenceError: Invalid left-hand side in assignment
ReferenceError: Invalid left-hand side in assignment
ReferenceError: Use before declaration
ReferenceError: Use before declaration
false
ReferenceError: Use before declaration
false
Expand Down