Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs

Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17

1 files changed, 17 insertions, 1 deletions

diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index dea87c6b63..7c33d60750 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, 0, 0 } };
+const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, 0, 0 }, 0 };
 
 const QMapNodeBase *QMapNodeBase::nextNode() const
 {
@@ -177,6 +177,12 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
     QMapNodeBase *x_parent;
     if (y->left == 0) {
         x = y->right;
+        if (y == mostLeftNode) {
+            if (x)
+                mostLeftNode = x; // It cannot have (left) children due the red black invariant.
+            else
+                mostLeftNode = y->parent();
+        }
     } else {
         if (y->right == 0) {
             x = y->left;
@@ -290,6 +296,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
     --size;
 }
 
+void QMapDataBase::recalcMostLeftNode()
+{
+    mostLeftNode = &header;
+    while (mostLeftNode->left)
+        mostLeftNode = mostLeftNode->left;
+}
+
 static inline int qMapAlignmentThreshold()
 {
     // malloc on 32-bit platforms should return pointers that are 8-byte
@@ -324,6 +337,8 @@ QMapNodeBase *QMapDataBase::createNode(int alloc, int alignment, QMapNodeBase *p
     if (parent) {
         if (left) {
             parent->left = node;
+            if (parent == mostLeftNode)
+                mostLeftNode = node;
         } else {
             parent->right = node;
         }
@@ -352,6 +367,7 @@ QMapDataBase *QMapDataBase::createData()
     d->header.p = 0;
     d->header.left = 0;
     d->header.right = 0;
+    d->mostLeftNode = &(d->header);
 
     return d;
 }