qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly implement the function prologue 

Set locals to undefined and declare them for global code

Change-Id: I41848f1463fa402a3c2b1f67117be86cc0d697a1
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Lars Knoll 2017-06-16 22:25:08 +02:00
parent cd03d4250e
commit a9287277e3
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qml/compiler/qv4codegen.cpp
View File

@ -2397,11 +2397,12 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
// variables in global code are properties of the global context object, not locals as with other functions. // variables in global code are properties of the global context object, not locals as with other functions.
if (_variableEnvironment->compilationMode == FunctionCode || _variableEnvironment->compilationMode == QmlBinding) { if (_variableEnvironment->compilationMode == FunctionCode || _variableEnvironment->compilationMode == QmlBinding) {
unsigned t = 0; unsigned t = 0;
Reference undef = Reference::fromConst(this, QV4::Encode::undefined());
for (Environment::MemberMap::iterator it = _variableEnvironment->members.begin(), end = _variableEnvironment->members.end(); it != end; ++it) { for (Environment::MemberMap::iterator it = _variableEnvironment->members.begin(), end = _variableEnvironment->members.end(); it != end; ++it) {
const QString &local = it.key(); const QString &local = it.key();
function->LOCAL(local); function->LOCAL(local);
(*it).index = t; (*it).index = t;
entryBlock->MOVE(entryBlock->LOCAL(t, 0), entryBlock->CONST(IR::UndefinedType, 0)); Reference::fromLocal(this, t, 0).store(undef);
++t; ++t;
} }
} else { } else {
@ -2416,21 +2417,13 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
} }
} }
IR::ExprList *args = 0;
for (Environment::MemberMap::const_iterator it = _variableEnvironment->members.constBegin(), cend = _variableEnvironment->members.constEnd(); it != cend; ++it) { for (Environment::MemberMap::const_iterator it = _variableEnvironment->members.constBegin(), cend = _variableEnvironment->members.constEnd(); it != cend; ++it) {
const QString &local = it.key(); const QString &local = it.key();
IR::ExprList *next = function->New<IR::ExprList>();
next->expr = entryBlock->NAME(local, 0, 0);
next->next = args;
args = next;
}
if (args) {
IR::ExprList *next = function->New<IR::ExprList>();
next->expr = entryBlock->CONST(IR::BoolType, false); // ### Investigate removal of bool deletable
next->next = args;
args = next;
entryBlock->EXP(entryBlock->CALL(entryBlock->NAME(IR::Name::builtin_declare_vars, 0, 0), args)); Instruction::CallBuiltinDeclareVar declareVar;
declareVar.isDeletable = false;
declareVar.varName = jsUnitGenerator->registerString(local);
bytecodeGenerator->addInstruction(declareVar);
} }
} }
@ -2471,15 +2464,14 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
} }
} }
if (_function->usesArgumentsObject) { if (_function->usesArgumentsObject) {
//### TODO Instruction::CallBuiltinSetupArgumentsObject setup;
// move(identifier(QStringLiteral("arguments"), ast->firstSourceLocation().startLine, ast->firstSourceLocation().startColumn), setup.result = Reference::fromName(this, QStringLiteral("arguments")).asLValue();
// _block->CALL(_block->NAME(IR::Name::builtin_setup_argument_object, bytecodeGenerator->addInstruction(setup);
// ast->firstSourceLocation().startLine, ast->firstSourceLocation().startColumn), 0));
} }
if (_function->usesThis && !_function->isStrict) { if (_function->usesThis && !_function->isStrict) {
// make sure we convert this to an object // make sure we convert this to an object
_block->EXP(_block->CALL(_block->NAME(IR::Name::builtin_convert_this_to_object, Instruction::CallBuiltinConvertThisToObject convert;
ast->firstSourceLocation().startLine, ast->firstSourceLocation().startColumn), 0)); bytecodeGenerator->addInstruction(convert);
} }
beginFunctionBodyHook(); beginFunctionBodyHook();