diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-23 09:42:16 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-31 17:08:00 +0000 |
| commit | 9337b1c339c34cd4fe10d236be2ee61ca76e17ba (patch) | |
| tree | 4fa5482063e447dc7d9988069cdeafd255e8933b /src/qml/compiler/qqmlirbuilder.cpp | |
| parent | 0a0e6e2ad2ed8224b5c1b6cd179677198e87288c (diff) | |
Clean up compilation unit string resolution
Replace use of CompiledData::Unit::stringAt with
CompilationUnit::stringAt as central place, in preparation for allowing
derived compilation units to retrieve strings from base units.
Change-Id: Ifafe6c18a9fd8d1e2259a60c17200124869b4c2d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmlirbuilder.cpp')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index d5d7d6d6b0..88527b0d94 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1776,7 +1776,7 @@ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output, const QV4: qDebug() << " " << qmlUnit->stringTableSize << "strings"; quint32 totalStringSize = 0; for (quint32 i = 0; i < qmlUnit->stringTableSize; ++i) - totalStringSize += QV4::CompiledData::String::calculateSize(qmlUnit->stringAt(i)); + totalStringSize += QV4::CompiledData::String::calculateSize(qmlUnit->stringAtInternal(i)); qDebug() << " " << totalStringSize << "bytes total strings"; } @@ -2354,7 +2354,7 @@ void IRLoader::load() { output->jsGenerator.stringTable.clear(); for (uint i = 0; i < unit->stringTableSize; ++i) - output->jsGenerator.stringTable.registerString(unit->stringAt(i)); + output->jsGenerator.stringTable.registerString(unit->stringAtInternal(i)); for (quint32 i = 0; i < unit->nImports; ++i) output->imports << unit->importAt(i); @@ -2491,7 +2491,7 @@ QmlIR::Object *IRLoader::loadObject(const QV4::CompiledData::Object *serializedO f->location = compiledFunction->location; f->nameIndex = compiledFunction->nameIndex; - const QString name = unit->stringAt(compiledFunction->nameIndex); + const QString name = unit->stringAtInternal(compiledFunction->nameIndex); f->formals.allocate(pool, int(compiledFunction->nFormals)); const quint32_le *formalNameIdx = compiledFunction->formalsTable(); |