<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160082] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160082">160082</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 01:57:48 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix !ENABLE(JAVASCRIPT_DEBUGGER) build.
https://bugs.webkit.org/show_bug.cgi?id=125083
Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-12-04
Reviewed by Mark Lam.
* debugger/Debugger.cpp:
* debugger/Debugger.h:
(JSC::Debugger::Debugger):
(JSC::Debugger::needsOpDebugCallbacks):
(JSC::Debugger::needsExceptionCallbacks):
(JSC::Debugger::detach):
(JSC::Debugger::sourceParsed):
(JSC::Debugger::exception):
(JSC::Debugger::atStatement):
(JSC::Debugger::callEvent):
(JSC::Debugger::returnEvent):
(JSC::Debugger::willExecuteProgram):
(JSC::Debugger::didExecuteProgram):
(JSC::Debugger::didReachBreakpoint):
* debugger/DebuggerPrimitives.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_debug):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_debug):
* llint/LLIntOfflineAsmConfig.h:
* llint/LowLevelInterpreter.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerPrimitivesh">trunk/Source/JavaScriptCore/debugger/DebuggerPrimitives.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntOfflineAsmConfigh">trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2013-12-04 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
+
+ Fix !ENABLE(JAVASCRIPT_DEBUGGER) build.
+ https://bugs.webkit.org/show_bug.cgi?id=125083
+
+ Reviewed by Mark Lam.
+
+ * debugger/Debugger.cpp:
+ * debugger/Debugger.h:
+ (JSC::Debugger::Debugger):
+ (JSC::Debugger::needsOpDebugCallbacks):
+ (JSC::Debugger::needsExceptionCallbacks):
+ (JSC::Debugger::detach):
+ (JSC::Debugger::sourceParsed):
+ (JSC::Debugger::exception):
+ (JSC::Debugger::atStatement):
+ (JSC::Debugger::callEvent):
+ (JSC::Debugger::returnEvent):
+ (JSC::Debugger::willExecuteProgram):
+ (JSC::Debugger::didExecuteProgram):
+ (JSC::Debugger::didReachBreakpoint):
+ * debugger/DebuggerPrimitives.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_debug):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_debug):
+ * llint/LLIntOfflineAsmConfig.h:
+ * llint/LowLevelInterpreter.asm:
+
</ins><span class="cx"> 2013-12-03 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> testapi test crashes on Windows in WTF::Vector<wchar_t,64,WTF::UnsafeVectorOverflow>::size().
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#if ENABLE(JAVASCRIPT_DEBUGGER)
+
</ins><span class="cx"> #include "Debugger.h"
</span><span class="cx">
</span><span class="cx"> #include "DebuggerCallFrame.h"
</span><span class="lines">@@ -587,3 +589,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><ins>+
+#endif // ENABLE(JAVASCRIPT_DEBUGGER)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx">
</span><span class="cx"> typedef ExecState CallFrame;
</span><span class="cx">
</span><ins>+#if ENABLE(JAVASCRIPT_DEBUGGER)
+
</ins><span class="cx"> class JS_EXPORT_PRIVATE Debugger {
</span><span class="cx"> public:
</span><span class="cx"> Debugger(bool isInWorkerThread = false);
</span><span class="lines">@@ -189,6 +191,26 @@
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#else // ENABLE(JAVASCRIPT_DEBUGGER)
+
+class Debugger {
+public:
+ Debugger(bool = false) { }
+ bool needsOpDebugCallbacks() const { return false; }
+ bool needsExceptionCallbacks() const { return false; }
+ void detach(JSGlobalObject*) { };
+ void sourceParsed(ExecState*, SourceProvider*, int, const WTF::String&) { };
+ void exception(CallFrame*, JSValue, bool) { };
+ void atStatement(CallFrame*) { };
+ void callEvent(CallFrame*) { };
+ void returnEvent(CallFrame*) { };
+ void willExecuteProgram(CallFrame*) { };
+ void didExecuteProgram(CallFrame*) { };
+ void didReachBreakpoint(CallFrame*) { };
+};
+
+#endif // ENABLE(JAVASCRIPT_DEBUGGER)
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // Debugger_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerPrimitivesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerPrimitives.h (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerPrimitives.h 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerPrimitives.h 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef DebuggerPrimitives_h
</span><span class="cx"> #define DebuggerPrimitives_h
</span><span class="cx">
</span><del>-#if ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> typedef size_t SourceID;
</span><span class="lines">@@ -38,6 +36,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><del>-#endif // ENABLE(JAVASCRIPT_DEBUGGER)
-
</del><span class="cx"> #endif // DebuggerPrimitives_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> #if ENABLE(DEBUG_WITH_BREAKPOINT)
</span><span class="cx"> UNUSED_PARAM(currentInstruction);
</span><span class="cx"> breakpoint();
</span><del>-#else
</del><ins>+#elif ENABLE(JAVASCRIPT_DEBUGGER)
</ins><span class="cx"> JSGlobalObject* globalObject = codeBlock()->globalObject();
</span><span class="cx"> Debugger* debugger = globalObject->debugger();
</span><span class="cx"> char* debuggerAddress = reinterpret_cast<char*>(globalObject) + JSGlobalObject::debuggerOffset();
</span><span class="lines">@@ -715,6 +715,8 @@
</span><span class="cx"> callOperation(operationDebug, currentInstruction[1].u.operand);
</span><span class="cx"> skipDebugHook.link(this);
</span><span class="cx"> noDebugger.link(this);
</span><ins>+#else
+ UNUSED_PARAM(currentInstruction);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx"> #if ENABLE(DEBUG_WITH_BREAKPOINT)
</span><span class="cx"> UNUSED_PARAM(currentInstruction);
</span><span class="cx"> breakpoint();
</span><del>-#else
</del><ins>+#elif ENABLE(JAVASCRIPT_DEBUGGER)
</ins><span class="cx"> JSGlobalObject* globalObject = codeBlock()->globalObject();
</span><span class="cx"> Debugger* debugger = globalObject->debugger();
</span><span class="cx"> char* debuggerAddress = reinterpret_cast<char*>(globalObject) + JSGlobalObject::debuggerOffset();
</span><span class="lines">@@ -997,6 +997,8 @@
</span><span class="cx"> callOperation(operationDebug, currentInstruction[1].u.operand);
</span><span class="cx"> skipDebugHook.link(this);
</span><span class="cx"> noDebugger.link(this);
</span><ins>+#else
+ UNUSED_PARAM(currentInstruction);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntOfflineAsmConfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -154,6 +154,12 @@
</span><span class="cx"> #define OFFLINE_ASM_ALWAYS_ALLOCATE_SLOW 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(JAVASCRIPT_DEBUGGER)
+#define OFFLINE_ASM_JAVASCRIPT_DEBUGGER 1
+#else
+#define OFFLINE_ASM_JAVASCRIPT_DEBUGGER 0
+#endif
+
</ins><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><span class="cx"> #define OFFLINE_ASM_VALUE_PROFILER 1
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (160081 => 160082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-04 09:56:14 UTC (rev 160081)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-04 09:57:48 UTC (rev 160082)
</span><span class="lines">@@ -820,6 +820,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_op_debug:
</span><ins>+if JAVASCRIPT_DEBUGGER
</ins><span class="cx"> traceExecution()
</span><span class="cx"> loadp CodeBlock[cfr], t0
</span><span class="cx"> loadp CodeBlock::m_globalObject[t0], t0
</span><span class="lines">@@ -830,6 +831,7 @@
</span><span class="cx">
</span><span class="cx"> callSlowPath(_llint_slow_path_debug)
</span><span class="cx"> .opDebugDone:
</span><ins>+end
</ins><span class="cx"> dispatch(2)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>