isLocked() assertion broke builds because ConcurrentJITLock isn't always a real lock.
authorsbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Apr 2016 20:47:24 +0000 (20:47 +0000)
committersbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Apr 2016 20:47:24 +0000 (20:47 +0000)
Rubber-stamped by Filip Pizlo.

* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::resultProfileForBytecodeOffset):
(JSC::CodeBlock::ensureResultProfile):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199384 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecode/CodeBlock.cpp

index 66e07f4..69d3d2e 100644 (file)
@@ -1,3 +1,13 @@
+2016-04-12  Saam barati  <sbarati@apple.com>
+
+        isLocked() assertion broke builds because ConcurrentJITLock isn't always a real lock.
+
+        Rubber-stamped by Filip Pizlo.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::resultProfileForBytecodeOffset):
+        (JSC::CodeBlock::ensureResultProfile):
+
 2016-04-11  Filip Pizlo  <fpizlo@apple.com>
 
         PolymorphicAccess should buffer AccessCases before regenerating
index f2e4944..9ef3a46 100644 (file)
@@ -4235,7 +4235,6 @@ ResultProfile* CodeBlock::resultProfileForBytecodeOffset(int bytecodeOffset)
 
 ResultProfile* CodeBlock::resultProfileForBytecodeOffset(const ConcurrentJITLocker&, int bytecodeOffset)
 {
-    ASSERT(m_lock.isLocked());
     if (!m_bytecodeOffsetToResultProfileIndexMap)
         return nullptr;
     auto iterator = m_bytecodeOffsetToResultProfileIndexMap->find(bytecodeOffset);
@@ -4253,7 +4252,6 @@ ResultProfile* CodeBlock::ensureResultProfile(int bytecodeOffset)
 
 ResultProfile* CodeBlock::ensureResultProfile(const ConcurrentJITLocker& locker, int bytecodeOffset)
 {
-    ASSERT(m_lock.isLocked());
     ResultProfile* profile = resultProfileForBytecodeOffset(locker, bytecodeOffset);
     if (!profile) {
         m_resultProfiles.append(ResultProfile(bytecodeOffset));