From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 22 Jul 2010 15:37:06 +0100
Subject: Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
---
 JavaScriptCore/yarr/RegexJIT.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'JavaScriptCore/yarr/RegexJIT.cpp')

diff --git a/JavaScriptCore/yarr/RegexJIT.cpp b/JavaScriptCore/yarr/RegexJIT.cpp
index 68d3803..609417f 100644
--- a/JavaScriptCore/yarr/RegexJIT.cpp
+++ b/JavaScriptCore/yarr/RegexJIT.cpp
@@ -1489,7 +1489,7 @@ void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const
         return;
     numSubpatterns = pattern.m_numSubpatterns;
 
-    if (!pattern.m_containsBackreferences) {
+    if (!pattern.m_containsBackreferences && globalData->canUseJIT()) {
         RegexGenerator generator(pattern);
         generator.compile(globalData, jitObject);
         if (!generator.shouldFallBack())
-- 
cgit v1.1