From d6a599dbc9d824a462b2b206316e102bf8136446 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jul 2012 13:45:28 +0200
Subject: Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644
 (http://svn.webkit.org/repository/webkit/trunk@122325)

New snapshot that should work with the latest Qt build system changes
---
 Source/JavaScriptCore/testRegExp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Source/JavaScriptCore/testRegExp.cpp')

diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp
index 6899ac284..61c21c31b 100644
--- a/Source/JavaScriptCore/testRegExp.cpp
+++ b/Source/JavaScriptCore/testRegExp.cpp
@@ -495,9 +495,8 @@ static void parseArguments(int argc, char** argv, CommandLine& options)
 
 int realMain(int argc, char** argv)
 {
-    JSLock lock(SilenceAssertionsOnly);
-
     RefPtr<JSGlobalData> globalData = JSGlobalData::create(ThreadStackTypeLarge, LargeHeap);
+    JSLockHolder lock(globalData.get());
 
     CommandLine options;
     parseArguments(argc, argv, options);
-- 
cgit v1.2.1