Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add return statement if the function doesn't end with one

Browse Source
This commit is contained in:
rogerl%netscape.com 2000-06-23 21:20:03 +00:00
parent a94e05dd4f
commit ea920b48c8
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/js2/icodegenerator.cpp
View File

@ -113,6 +113,17 @@ ICodeModule *ICodeGenerator::complete()
ASSERT((*i)->mOffset <= iCode->size());
}
#endif
if (iCode->size()) {
ICodeOp lastOp = (*iCode)[iCode->size() - 1]->op();
if ((lastOp != RETURN) && (lastOp != RETURN_VOID))
returnStmt();
}
else
returnStmt();
/*
XXX FIXME
I wanted to do the following rather than have to have the label set hanging around as well
@ -397,10 +408,12 @@ GenericBranch *ICodeGenerator::branchFalse(Label *label, TypedRegister condition
void ICodeGenerator::returnStmt(TypedRegister r)
{
if (r.first == NotARegister)
iCode->push_back(new ReturnVoid());
else
iCode->push_back(new Return(r));
iCode->push_back(new Return(r));
}
void ICodeGenerator::returnStmt()
{
iCode->push_back(new ReturnVoid());
}
@ -588,7 +601,8 @@ TypedRegister ICodeGenerator::genExpr(ExprNode *p,
if (i->op->getKind() == ExprNode::dot) {
BinaryExprNode *b = static_cast<BinaryExprNode *>(i->op);
ret = methodCall(genExpr(b->op1), loadString(static_cast<IdentifierExprNode *>(b->op2)->name), args);
TypedRegister base = genExpr(b->op1);
ret = methodCall(base, loadString(static_cast<IdentifierExprNode *>(b->op2)->name), args);
}
else
if (i->op->getKind() == ExprNode::identifier) {

1
js/js2/icodegenerator.h
View File

@ -200,6 +200,7 @@ namespace ICG {
void isScript() { mWithinWith = true; }
void returnStmt(TypedRegister r);
void returnStmt();
void throwStmt(TypedRegister r)
{ iCode->push_back(new Throw(r)); }

24
js2/src/icodegenerator.cpp
View File

@ -113,6 +113,17 @@ ICodeModule *ICodeGenerator::complete()
ASSERT((*i)->mOffset <= iCode->size());
}
#endif
if (iCode->size()) {
ICodeOp lastOp = (*iCode)[iCode->size() - 1]->op();
if ((lastOp != RETURN) && (lastOp != RETURN_VOID))
returnStmt();
}
else
returnStmt();
/*
XXX FIXME
I wanted to do the following rather than have to have the label set hanging around as well
@ -397,10 +408,12 @@ GenericBranch *ICodeGenerator::branchFalse(Label *label, TypedRegister condition
void ICodeGenerator::returnStmt(TypedRegister r)
{
if (r.first == NotARegister)
iCode->push_back(new ReturnVoid());
else
iCode->push_back(new Return(r));
iCode->push_back(new Return(r));
}
void ICodeGenerator::returnStmt()
{
iCode->push_back(new ReturnVoid());
}
@ -588,7 +601,8 @@ TypedRegister ICodeGenerator::genExpr(ExprNode *p,
if (i->op->getKind() == ExprNode::dot) {
BinaryExprNode *b = static_cast<BinaryExprNode *>(i->op);
ret = methodCall(genExpr(b->op1), loadString(static_cast<IdentifierExprNode *>(b->op2)->name), args);
TypedRegister base = genExpr(b->op1);
ret = methodCall(base, loadString(static_cast<IdentifierExprNode *>(b->op2)->name), args);
}
else
if (i->op->getKind() == ExprNode::identifier) {

1
js2/src/icodegenerator.h
View File

@ -200,6 +200,7 @@ namespace ICG {
void isScript() { mWithinWith = true; }
void returnStmt(TypedRegister r);
void returnStmt();
void throwStmt(TypedRegister r)
{ iCode->push_back(new Throw(r)); }