Skip to content

Fix few more line/column issue. #1696

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
Oct 5, 2016
Merged

Fix few more line/column issue. #1696

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
33 changes: 6 additions & 27 deletions lib/Runtime/ByteCode/ByteCodeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8787,40 +8787,35 @@ void SetNewArrayElements(ParseNode *pnode, Js::RegSlot arrayLocation, ByteCodeGe
void EmitBooleanExpression(ParseNode *expr, Js::ByteCodeLabel trueLabel, Js::ByteCodeLabel falseLabel, ByteCodeGenerator *byteCodeGenerator,
FuncInfo *funcInfo)
{
byteCodeGenerator->StartStatement(expr);
switch (expr->nop)
{

case knopLogOr:
{
byteCodeGenerator->StartStatement(expr);
Js::ByteCodeLabel leftFalse = byteCodeGenerator->Writer()->DefineLabel();
EmitBooleanExpression(expr->sxBin.pnode1, trueLabel, leftFalse, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxBin.pnode1);
byteCodeGenerator->Writer()->MarkLabel(leftFalse);
EmitBooleanExpression(expr->sxBin.pnode2, trueLabel, falseLabel, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxBin.pnode2);
byteCodeGenerator->EndStatement(expr);
break;
}

case knopLogAnd:
{
byteCodeGenerator->StartStatement(expr);
Js::ByteCodeLabel leftTrue = byteCodeGenerator->Writer()->DefineLabel();
EmitBooleanExpression(expr->sxBin.pnode1, leftTrue, falseLabel, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxBin.pnode1);
byteCodeGenerator->Writer()->MarkLabel(leftTrue);
EmitBooleanExpression(expr->sxBin.pnode2, trueLabel, falseLabel, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxBin.pnode2);
byteCodeGenerator->EndStatement(expr);
break;
}

case knopLogNot:
byteCodeGenerator->StartStatement(expr);
EmitBooleanExpression(expr->sxUni.pnode1, falseLabel, trueLabel, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxUni.pnode1);
byteCodeGenerator->EndStatement(expr);
break;

case knopEq:
Expand All @@ -8831,47 +8826,31 @@ void EmitBooleanExpression(ParseNode *expr, Js::ByteCodeLabel trueLabel, Js::Byt
case knopLe:
case knopGe:
case knopGt:
byteCodeGenerator->StartStatement(expr);
EmitBinaryOpnds(expr->sxBin.pnode1, expr->sxBin.pnode2, byteCodeGenerator, funcInfo);
funcInfo->ReleaseLoc(expr->sxBin.pnode2);
funcInfo->ReleaseLoc(expr->sxBin.pnode1);
byteCodeGenerator->Writer()->BrReg2(nopToOp[expr->nop], trueLabel, expr->sxBin.pnode1->location,
expr->sxBin.pnode2->location);
byteCodeGenerator->Writer()->Br(falseLabel);
byteCodeGenerator->EndStatement(expr);
break;
case knopTrue:
byteCodeGenerator->StartStatement(expr);
byteCodeGenerator->Writer()->Br(trueLabel);
byteCodeGenerator->EndStatement(expr);
break;
case knopFalse:
byteCodeGenerator->StartStatement(expr);
byteCodeGenerator->Writer()->Br(falseLabel);
byteCodeGenerator->EndStatement(expr);
break;
default:
// Note: we usually release the temp assigned to a node after we Emit it.
// But in this case, EmitBooleanExpression is just a wrapper around a normal Emit call,
// and the caller of EmitBooleanExpression expects to be able to release this register.

// For diagnostics purposes, register the name/dot/index to the statement list.
if (expr->nop == knopName || expr->nop == knopDot || expr->nop == knopIndex)
{
byteCodeGenerator->StartStatement(expr);
Emit(expr, byteCodeGenerator, funcInfo, false);
byteCodeGenerator->Writer()->BrReg1(Js::OpCode::BrTrue_A, trueLabel, expr->location);
byteCodeGenerator->Writer()->Br(falseLabel);
byteCodeGenerator->EndStatement(expr);
}
else
{
Emit(expr, byteCodeGenerator, funcInfo, false);
byteCodeGenerator->Writer()->BrReg1(Js::OpCode::BrTrue_A, trueLabel, expr->location);
byteCodeGenerator->Writer()->Br(falseLabel);
}
Emit(expr, byteCodeGenerator, funcInfo, false);
byteCodeGenerator->Writer()->BrReg1(Js::OpCode::BrTrue_A, trueLabel, expr->location);
byteCodeGenerator->Writer()->Br(falseLabel);
break;
}

byteCodeGenerator->EndStatement(expr);
}

// used by while and for loops
Expand Down
8 changes: 8 additions & 0 deletions test/Error/validate_line_column.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ ReferenceError: 'unresolved' is undefined
at Anonymous function (validate_line_column.js:65:11)
at foo (validate_line_column.js:10:9)
at Global code (validate_line_column.js:63:1)
ReferenceError: 'unresolved' is undefined
at Anonymous function (validate_line_column.js:72:11)
at foo (validate_line_column.js:10:9)
at Global code (validate_line_column.js:70:1)
ReferenceError: 'unresolved' is undefined
at Anonymous function (validate_line_column.js:79:11)
at foo (validate_line_column.js:10:9)
at Global code (validate_line_column.js:77:1)
14 changes: 14 additions & 0 deletions test/Error/validate_line_column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,17 @@ foo(function() {
break;
}
});

foo(function() {
var k = 1;
while(typeof unresolved[0]) { // Error thrown here.
break;
}
});

foo(function() {
var k = 1;
while(unresolved instanceof blah) { // Error thrown here.
break;
}
});