2 files changed, 25 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index fa3cbb5bcc..3032363cb4 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -62,7 +62,7 @@ uint RegExp::match(const QString &string, int start, uint *matchOffsets)
     WTF::String s(string);
 
 #if ENABLE(YARR_JIT)
-    if (!jitCode()->isFallBack() && jitCode()->has16BitCode())
+    if (d()->hasValidJITCode())
         return uint(jitCode()->execute(s.characters16(), start, s.length(), (int*)matchOffsets).start);
 #endif
 
@@ -82,7 +82,7 @@ Heap::RegExp *RegExp::create(ExecutionEngine* engine, const QString& pattern, bo
         return result->d();
 
     Scope scope(engine);
-    Scoped<RegExp> result(scope, engine->memoryManager->alloc<RegExp>(engine, pattern, ignoreCase, multiline));
+    Scoped<RegExp> result(scope, engine->memoryManager->alloc<RegExp>(pattern, ignoreCase, multiline));
 
     result->d()->cache = cache;
     cachedValue.set(engine, result);
@@ -90,27 +90,34 @@ Heap::RegExp *RegExp::create(ExecutionEngine* engine, const QString& pattern, bo
     return result->d();
 }
 
-void Heap::RegExp::init(ExecutionEngine* engine, const QString &pattern, bool ignoreCase, bool multiline)
+void Heap::RegExp::init(const QString &pattern, bool ignoreCase, bool multiline)
 {
     Base::init();
     this->pattern = new QString(pattern);
     this->ignoreCase = ignoreCase;
     this->multiLine = multiline;
+    valid = false;
 
     const char* error = 0;
-    JSC::Yarr::YarrPattern yarrPattern(WTF::String(pattern), ignoreCase, multiline, &error);
+    JSC::Yarr::YarrPattern yarrPattern(WTF::String(pattern), ignoreCase, multiLine, &error);
     if (error)
         return;
     subPatternCount = yarrPattern.m_numSubpatterns;
-    OwnPtr<JSC::Yarr::BytecodePattern> p = JSC::Yarr::byteCompile(yarrPattern, engine->bumperPointerAllocator);
-    byteCode = p.take();
 #if ENABLE(YARR_JIT)
-    jitCode = new JSC::Yarr::YarrCodeBlock;
     if (!yarrPattern.m_containsBackreferences) {
-        JSC::JSGlobalData dummy(engine->regExpAllocator);
+        jitCode = new JSC::Yarr::YarrCodeBlock;
+        JSC::JSGlobalData dummy(internalClass->engine->regExpAllocator);
         JSC::Yarr::jitCompile(yarrPattern, JSC::Yarr::Char16, &dummy, *jitCode);
     }
 #endif
+    if (hasValidJITCode()) {
+        valid = true;
+        return;
+    }
+    OwnPtr<JSC::Yarr::BytecodePattern> p = JSC::Yarr::byteCompile(yarrPattern, internalClass->engine->bumperPointerAllocator);
+    byteCode = p.take();
+    if (byteCode)
+        valid = true;
 }
 
 void Heap::RegExp::destroy()
diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
index 7ab12fe245..59277ca3cd 100644
--- a/src/qml/jsruntime/qv4regexp_p.h
+++ b/src/qml/jsruntime/qv4regexp_p.h
@@ -76,7 +76,7 @@ struct RegExpCacheKey;
 namespace Heap {
 
 struct RegExp : Base {
-    void init(ExecutionEngine* engine, const QString& pattern, bool ignoreCase, bool multiline);
+    void init(const QString& pattern, bool ignoreCase, bool multiline);
     void destroy();
 
     QString *pattern;
@@ -84,10 +84,18 @@ struct RegExp : Base {
 #if ENABLE(YARR_JIT)
     JSC::Yarr::YarrCodeBlock *jitCode;
 #endif
+    bool hasValidJITCode() const {
+#if ENABLE(YARR_JIT)
+        return jitCode && !jitCode->isFallBack() && jitCode->has16BitCode();
+#else
+        return false;
+#endif
+    }
     RegExpCache *cache;
     int subPatternCount;
     bool ignoreCase;
     bool multiLine;
+    bool valid;
 
     int captureCount() const { return subPatternCount + 1; }
 };
@@ -114,7 +122,7 @@ struct RegExp : public Managed
 
     static Heap::RegExp *create(ExecutionEngine* engine, const QString& pattern, bool ignoreCase = false, bool multiline = false);
 
-    bool isValid() const { return d()->byteCode; }
+    bool isValid() const { return d()->valid; }
 
     uint match(const QString& string, int start, uint *matchOffsets);