Title: [156126] trunk/Source/_javascript_Core
- Revision
- 156126
- Author
- [email protected]
- Date
- 2013-09-19 15:42:35 -0700 (Thu, 19 Sep 2013)
Log Message
Unreviewed, fix Windows build part 2. m_jitCodeMap should always be there.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::jitCodeMap):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (156125 => 156126)
--- trunk/Source/_javascript_Core/ChangeLog 2013-09-19 22:38:24 UTC (rev 156125)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-09-19 22:42:35 UTC (rev 156126)
@@ -1,5 +1,12 @@
2013-09-19 Filip Pizlo <[email protected]>
+ Unreviewed, fix Windows build part 2. m_jitCodeMap should always be there.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::jitCodeMap):
+
+2013-09-19 Filip Pizlo <[email protected]>
+
Remove some of the tautologies in DFGRepatch function naming.
Rubber stamped by Mark Hahnenberg.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (156125 => 156126)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-09-19 22:38:24 UTC (rev 156125)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-09-19 22:42:35 UTC (rev 156126)
@@ -232,7 +232,6 @@
void linkIncomingCall(ExecState* callerFrame, LLIntCallLinkInfo*);
#endif // ENABLE(LLINT)
-#if ENABLE(DFG_JIT) || ENABLE(LLINT)
void setJITCodeMap(PassOwnPtr<CompactJITCodeMap> jitCodeMap)
{
m_jitCodeMap = jitCodeMap;
@@ -241,7 +240,6 @@
{
return m_jitCodeMap.get();
}
-#endif
unsigned bytecodeOffset(Instruction* returnAddress)
{
@@ -1095,9 +1093,7 @@
Vector<CallLinkInfo> m_callLinkInfos;
SentinelLinkedList<CallLinkInfo, BasicRawSentinelNode<CallLinkInfo> > m_incomingCalls;
#endif
-#if ENABLE(DFG_JIT) || ENABLE(LLINT)
OwnPtr<CompactJITCodeMap> m_jitCodeMap;
-#endif
#if ENABLE(DFG_JIT)
// This is relevant to non-DFG code blocks that serve as the profiled code block
// for DFG code blocks.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
