4 files changed, 25 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
index f7e88dddd6..a21bf696aa 100644
--- a/src/qml/jsruntime/qv4persistent.cpp
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -312,6 +312,12 @@ WeakValue::WeakValue(const WeakValue &other)
     }
 }
 
+WeakValue::WeakValue(ExecutionEngine *engine, const Value &value)
+{
+    val = engine->memoryManager->m_weakValues->allocate();
+    *val = value;
+}
+
 WeakValue &WeakValue::operator=(const WeakValue &other)
 {
     if (!val) {
diff --git a/src/qml/jsruntime/qv4persistent_p.h b/src/qml/jsruntime/qv4persistent_p.h
index 90e62e7aac..858734e9ed 100644
--- a/src/qml/jsruntime/qv4persistent_p.h
+++ b/src/qml/jsruntime/qv4persistent_p.h
@@ -129,6 +129,7 @@ class Q_QML_EXPORT WeakValue
 public:
     WeakValue() : val(0) {}
     WeakValue(const WeakValue &other);
+    WeakValue(ExecutionEngine *engine, const Value &value);
     WeakValue &operator=(const WeakValue &other);
     ~WeakValue();
 
@@ -147,6 +148,12 @@ public:
             return 0;
         return val->as<Managed>();
     }
+    template <typename T>
+    T *as() const {
+        if (!val)
+            return 0;
+        return val->as<T>();
+    }
 
     ExecutionEngine *engine() const {
         if (!val)
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 715df2d666..31fee534ad 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -40,10 +40,10 @@ using namespace QV4;
 
 RegExpCache::~RegExpCache()
 {
-    for (RegExpCache::Iterator it = begin(), e = end();
-         it != e; ++it)
-        it.value()->cache = 0;
-    clear();
+    for (RegExpCache::Iterator it = begin(), e = end(); it != e; ++it) {
+        if (RegExp *re = it.value().as<RegExp>())
+            re->d()->cache = 0;
+    }
 }
 
 DEFINE_MANAGED_VTABLE(RegExp);
@@ -68,19 +68,18 @@ Heap::RegExp *RegExp::create(ExecutionEngine* engine, const QString& pattern, bo
     RegExpCacheKey key(pattern, ignoreCase, multiline);
 
     RegExpCache *cache = engine->regExpCache;
-    if (cache) {
-        if (Heap::RegExp *result = cache->value(key))
-            return result;
-    }
+    if (!cache)
+        cache = engine->regExpCache = new RegExpCache;
+
+    QV4::WeakValue &cachedValue = (*cache)[key];
+    if (QV4::RegExp *result = cachedValue.as<RegExp>())
+        return result->d();
 
     Scope scope(engine);
     Scoped<RegExp> result(scope, engine->memoryManager->alloc<RegExp>(engine, pattern, ignoreCase, multiline));
 
-    if (!cache)
-        cache = engine->regExpCache = new RegExpCache;
-
     result->d()->cache = cache;
-    cache->insert(key, result->d());
+    cachedValue.set(engine, result);
 
     return result->d();
 }
diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
index 819e31e5f1..af6e346ea8 100644
--- a/src/qml/jsruntime/qv4regexp_p.h
+++ b/src/qml/jsruntime/qv4regexp_p.h
@@ -133,8 +133,7 @@ inline RegExpCacheKey::RegExpCacheKey(const RegExp::Data *re)
 inline uint qHash(const RegExpCacheKey& key, uint seed = 0) Q_DECL_NOTHROW
 { return qHash(key.pattern, seed); }
 
-// ### GC
-class RegExpCache : public QHash<RegExpCacheKey, Heap::RegExp*>
+class RegExpCache : public QHash<RegExpCacheKey, WeakValue>
 {
 public:
     ~RegExpCache();