Title: [166178] trunk/Source/_javascript_Core
- Revision
- 166178
- Author
- [email protected]
- Date
- 2014-03-24 10:29:51 -0700 (Mon, 24 Mar 2014)
Log Message
Unreviewed, fix CLOOP build.
* bytecode/CallLinkStatus.cpp:
(JSC::CallLinkStatus::computeFor):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::printCallOp):
(JSC::CodeBlock::getCallLinkInfoForBytecodeIndex):
(JSC::CodeBlock::resetStubDuringGCInternal): Deleted.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::callLinkInfosEnd): Deleted.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (166177 => 166178)
--- trunk/Source/_javascript_Core/ChangeLog 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-03-24 17:29:51 UTC (rev 166178)
@@ -1,3 +1,16 @@
+2014-03-24 Filip Pizlo <[email protected]>
+
+ Unreviewed, fix CLOOP build.
+
+ * bytecode/CallLinkStatus.cpp:
+ (JSC::CallLinkStatus::computeFor):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::printCallOp):
+ (JSC::CodeBlock::getCallLinkInfoForBytecodeIndex):
+ (JSC::CodeBlock::resetStubDuringGCInternal): Deleted.
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::callLinkInfosEnd): Deleted.
+
2014-03-24 Gabor Rapcsanyi <[email protected]>
[ARM64] GNU assembler doesn't work with LLInt arm64 backend.
Modified: trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp (166177 => 166178)
--- trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/_javascript_Core/bytecode/CallLinkStatus.cpp 2014-03-24 17:29:51 UTC (rev 166178)
@@ -122,6 +122,7 @@
UNUSED_PARAM(profiledBlock);
UNUSED_PARAM(bytecodeIndex);
+ UNUSED_PARAM(map);
#if ENABLE(DFG_JIT)
if (profiledBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadCache))
|| profiledBlock->hasExitSite(locker, DFG::FrequentExitSite(bytecodeIndex, BadCacheWatchpoint))
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (166177 => 166178)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-03-24 17:29:51 UTC (rev 166178)
@@ -433,6 +433,8 @@
out.printf(" jit(%p, exec %p)", target, target->executable());
}
out.print(" status(", CallLinkStatus::computeFor(this, location, map), ")");
+#else
+ UNUSED_PARAM(map);
#endif
}
++it;
@@ -2310,20 +2312,7 @@
getCallLinkInfoMap(locker, result);
}
-CallLinkInfo* CodeBlock::getCallLinkInfoForBytecodeIndex(unsigned index)
-{
#if ENABLE(JIT)
- for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) {
- if ((*iter)->codeOrigin == CodeOrigin(index))
- return *iter;
- }
-#else
- UNUSED_PARAM(index);
-#endif
- return nullptr;
-}
-
-#if ENABLE(JIT)
StructureStubInfo* CodeBlock::addStubInfo()
{
ConcurrentJITLocker locker(m_lock);
@@ -2376,6 +2365,15 @@
resetStubInternal(repatchBuffer, stubInfo);
stubInfo.resetByGC = true;
}
+
+CallLinkInfo* CodeBlock::getCallLinkInfoForBytecodeIndex(unsigned index)
+{
+ for (auto iter = m_callLinkInfos.begin(); !!iter; ++iter) {
+ if ((*iter)->codeOrigin == CodeOrigin(index))
+ return *iter;
+ }
+ return nullptr;
+}
#endif
void CodeBlock::stronglyVisitStrongReferences(SlotVisitor& visitor)
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (166177 => 166178)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2014-03-24 17:21:46 UTC (rev 166177)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2014-03-24 17:29:51 UTC (rev 166178)
@@ -184,10 +184,6 @@
void getCallLinkInfoMap(const ConcurrentJITLocker&, CallLinkInfoMap& result);
void getCallLinkInfoMap(CallLinkInfoMap& result);
- // This is a slow function call used primarily for compiling OSR exits in the case
- // that there had been inlining. Chances are if you want to use this, you're really
- // looking for a CallLinkInfoMap to amortize the cost of calling this.
- CallLinkInfo* getCallLinkInfoForBytecodeIndex(unsigned bytecodeIndex);
#if ENABLE(JIT)
StructureStubInfo* addStubInfo();
Bag<StructureStubInfo>::iterator stubInfoBegin() { return m_stubInfos.begin(); }
@@ -203,6 +199,11 @@
CallLinkInfo* addCallLinkInfo();
Bag<CallLinkInfo>::iterator callLinkInfosBegin() { return m_callLinkInfos.begin(); }
Bag<CallLinkInfo>::iterator callLinkInfosEnd() { return m_callLinkInfos.end(); }
+
+ // This is a slow function call used primarily for compiling OSR exits in the case
+ // that there had been inlining. Chances are if you want to use this, you're really
+ // looking for a CallLinkInfoMap to amortize the cost of calling this.
+ CallLinkInfo* getCallLinkInfoForBytecodeIndex(unsigned bytecodeIndex);
#endif // ENABLE(JIT)
void unlinkIncomingCalls();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
