summaryrefslogtreecommitdiff
path: root/src/qml/compiler/qv4compileddata.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-04-04 10:35:45 +0200
committerLars Knoll <lars.knoll@qt.io>2017-04-07 12:47:04 +0000
commitfdb1a7da37e2482a22ca32d52e2833bf67d90bc9 (patch)
tree796ab2b16a4fe42c9fb114c8e6fc3872bd929ccb /src/qml/compiler/qv4compileddata.cpp
parentb361a59c699fca02379c149cf0b9c59490a1ba62 (diff)
downloadqtdeclarative-fdb1a7da37e2482a22ca32d52e2833bf67d90bc9.tar.gz
Cleanups: Remove Steele barrier code
Remove the code related to the Steele write barrier and incremental garbage collection. This is in preparation for a fully concurrent GC, that will not have and incremental mode and will use a Yuasa write barrier. Change-Id: I155a85211c5be61e792e056321fbceaee47c0d87 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compileddata.cpp')
-rw-r--r--src/qml/compiler/qv4compileddata.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index 7940e5715e..adc36ff1dd 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -125,10 +125,8 @@ QV4::Function *CompilationUnit::linkToEngine(ExecutionEngine *engine)
runtimeStrings = (QV4::Heap::String **)malloc(data->stringTableSize * sizeof(QV4::Heap::String*));
// memset the strings to 0 in case a GC run happens while we're within the loop below
memset(runtimeStrings, 0, data->stringTableSize * sizeof(QV4::Heap::String*));
- for (uint i = 0; i < data->stringTableSize; ++i) {
+ for (uint i = 0; i < data->stringTableSize; ++i)
runtimeStrings[i] = engine->newIdentifier(data->stringAt(i));
- runtimeStrings[i]->setMarkBit();
- }
runtimeRegularExpressions = new QV4::Value[data->regexpTableSize];
// memset the regexps to 0 in case a GC run happens while we're within the loop below
@@ -144,12 +142,6 @@ QV4::Function *CompilationUnit::linkToEngine(ExecutionEngine *engine)
flags |= IR::RegExp::RegExp_Multiline;
QV4::Heap::RegExpObject *ro = engine->newRegExpObject(data->stringAt(re->stringIndex), flags);
runtimeRegularExpressions[i] = ro;
-#if WRITEBARRIER(steele)
- if (engine->memoryManager->nextGCIsIncremental) {
- ro->setMarkBit();
- ro->setGrayBit();
- }
-#endif
}
if (data->lookupTableSize) {