Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 7 insertions, 8 deletions

diff --git a/Source/JavaScriptCore/parser/SourceProvider.cpp b/Source/JavaScriptCore/parser/SourceProvider.cpp
index 47b29aa37..475bc6dfc 100644
--- a/Source/JavaScriptCore/parser/SourceProvider.cpp
+++ b/Source/JavaScriptCore/parser/SourceProvider.cpp
@@ -25,8 +25,10 @@
 
 #include "config.h"
 #include "SourceProvider.h"
+
+#include "JSCInlines.h"
+#include <wtf/Lock.h>
 #include <wtf/StdLibExtras.h>
-#include <wtf/TCSpinLock.h>
 
 namespace JSC {
 
@@ -42,21 +44,18 @@ SourceProvider::~SourceProvider()
 {
 }
 
-static inline size_t charPositionExtractor(const size_t* value)
-{
-    return *value;
-}
-
-static TCMalloc_SpinLock providerIdLock = SPINLOCK_INITIALIZER;
+static StaticLock providerIdLock;
 
 void SourceProvider::getID()
 {
-    SpinLockHolder lock(&providerIdLock);
+    LockHolder lock(&providerIdLock);
     if (!m_id) {
         static intptr_t nextProviderID = 0;
         m_id = ++nextProviderID;
     }
 }
 
+StringSourceProvider::~StringSourceProvider() = default;
+
 } // namespace JSC