<!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>[206707] 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/206707">206707</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-01 08:32:59 -0700 (Sat, 01 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename DebugHookID to DebugHookType
https://bugs.webkit.org/show_bug.cgi?id=162820
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-01
Reviewed by Alex Christensen.
* bytecode/CodeBlock.cpp:
(JSC::debugHookName):
(JSC::CodeBlock::dumpBytecode):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitDebugHook):
* bytecompiler/BytecodeGenerator.h:
* interpreter/Interpreter.cpp:
(JSC::Interpreter::debug):
* interpreter/Interpreter.h:
* jit/JITOperations.cpp:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Rename DebugHookID to DebugHookType
+ https://bugs.webkit.org/show_bug.cgi?id=162820
+
+ Reviewed by Alex Christensen.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::debugHookName):
+ (JSC::CodeBlock::dumpBytecode):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitDebugHook):
+ * bytecompiler/BytecodeGenerator.h:
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::debug):
+ * interpreter/Interpreter.h:
+ * jit/JITOperations.cpp:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+
</ins><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Stepping to a line with an autoContinue breakpoint should still pause
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -299,9 +299,9 @@
</span><span class="cx"> return toCString(regexpToSourceString(regexp), "(@re", re, ")");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NEVER_INLINE static const char* debugHookName(int debugHookID)
</del><ins>+NEVER_INLINE static const char* debugHookName(int debugHookType)
</ins><span class="cx"> {
</span><del>- switch (static_cast<DebugHookID>(debugHookID)) {
</del><ins>+ switch (static_cast<DebugHookType>(debugHookType)) {
</ins><span class="cx"> case DidEnterCallFrame:
</span><span class="cx"> return "didEnterCallFrame";
</span><span class="cx"> case WillLeaveCallFrame:
</span><span class="lines">@@ -1661,10 +1661,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_debug: {
</span><del>- int debugHookID = (++it)->u.operand;
</del><ins>+ int debugHookType = (++it)->u.operand;
</ins><span class="cx"> int hasBreakpointFlag = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "debug");
</span><del>- out.printf("%s, %d", debugHookName(debugHookID), hasBreakpointFlag);
</del><ins>+ out.printf("%s, %d", debugHookName(debugHookType), hasBreakpointFlag);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_assert: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -3459,7 +3459,7 @@
</span><span class="cx"> RELEASE_ASSERT(stackEntry.m_isWithScope);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, const JSTextPosition& divot)
</del><ins>+void BytecodeGenerator::emitDebugHook(DebugHookType debugHookType, const JSTextPosition& divot)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_shouldEmitDebugHooks)
</span><span class="cx"> return;
</span><span class="lines">@@ -3466,13 +3466,13 @@
</span><span class="cx">
</span><span class="cx"> emitExpressionInfo(divot, divot, divot);
</span><span class="cx"> emitOpcode(op_debug);
</span><del>- instructions().append(debugHookID);
</del><ins>+ instructions().append(debugHookType);
</ins><span class="cx"> instructions().append(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, unsigned line, unsigned charOffset, unsigned lineStart)
</del><ins>+void BytecodeGenerator::emitDebugHook(DebugHookType debugHookType, unsigned line, unsigned charOffset, unsigned lineStart)
</ins><span class="cx"> {
</span><del>- emitDebugHook(debugHookID, JSTextPosition(line, charOffset, lineStart));
</del><ins>+ emitDebugHook(debugHookType, JSTextPosition(line, charOffset, lineStart));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::emitDebugHook(StatementNode* statement)
</span><span class="lines">@@ -3481,10 +3481,10 @@
</span><span class="cx"> emitDebugHook(WillExecuteStatement, statement->position());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::emitDebugHook(ExpressionNode* expr, DebugHookID debugHookID)
</del><ins>+void BytecodeGenerator::emitDebugHook(ExpressionNode* expr, DebugHookType debugHookType)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(expr->needsDebugHook());
</span><del>- emitDebugHook(debugHookID, expr->position());
</del><ins>+ emitDebugHook(debugHookType, expr->position());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::emitWillLeaveCallFrameDebugHook()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -676,10 +676,10 @@
</span><span class="cx"> void emitPutDerivedConstructorToArrowFunctionContextScope();
</span><span class="cx"> RegisterID* emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment();
</span><span class="cx">
</span><del>- void emitDebugHook(DebugHookID, const JSTextPosition&);
- void emitDebugHook(DebugHookID, unsigned line, unsigned charOffset, unsigned lineStart);
</del><ins>+ void emitDebugHook(DebugHookType, const JSTextPosition&);
+ void emitDebugHook(DebugHookType, unsigned line, unsigned charOffset, unsigned lineStart);
</ins><span class="cx"> void emitDebugHook(StatementNode*);
</span><del>- void emitDebugHook(ExpressionNode*, DebugHookID);
</del><ins>+ void emitDebugHook(ExpressionNode*, DebugHookType);
</ins><span class="cx"> void emitWillLeaveCallFrameDebugHook();
</span><span class="cx">
</span><span class="cx"> bool isInFinallyBlock() { return m_finallyDepth > 0; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx"> return checkedReturn(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NEVER_INLINE void Interpreter::debug(CallFrame* callFrame, DebugHookID debugHookID)
</del><ins>+NEVER_INLINE void Interpreter::debug(CallFrame* callFrame, DebugHookType debugHookType)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = callFrame->vm();
</span><span class="cx"> auto scope = DECLARE_CATCH_SCOPE(vm);
</span><span class="lines">@@ -1231,7 +1231,7 @@
</span><span class="cx"> ASSERT(callFrame->codeBlock()->hasDebuggerRequests());
</span><span class="cx"> ASSERT_UNUSED(scope, !scope.exception());
</span><span class="cx">
</span><del>- switch (debugHookID) {
</del><ins>+ switch (debugHookType) {
</ins><span class="cx"> case DidEnterCallFrame:
</span><span class="cx"> debugger->callEvent(callFrame);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> enum UnwindStart : uint8_t { UnwindFromCurrentFrame, UnwindFromCallerFrame };
</span><span class="cx">
</span><del>- enum DebugHookID {
</del><ins>+ enum DebugHookType {
</ins><span class="cx"> WillExecuteProgram,
</span><span class="cx"> DidExecuteProgram,
</span><span class="cx"> DidEnterCallFrame,
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE HandlerInfo* unwind(VM&, CallFrame*&, Exception*, UnwindStart);
</span><span class="cx"> void notifyDebuggerOfExceptionToBeThrown(CallFrame*, Exception*);
</span><del>- NEVER_INLINE void debug(CallFrame*, DebugHookID);
</del><ins>+ NEVER_INLINE void debug(CallFrame*, DebugHookType);
</ins><span class="cx"> static JSString* stackTraceAsString(VM&, const Vector<StackFrame>&);
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithErrorConstructor(ExecState*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -1179,12 +1179,12 @@
</span><span class="cx"> throwTypeError(exec, scope, errorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT_OPERATION operationDebug(ExecState* exec, int32_t debugHookID)
</del><ins>+void JIT_OPERATION operationDebug(ExecState* exec, int32_t debugHookType)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><del>- vm.interpreter->debug(exec, static_cast<DebugHookID>(debugHookID));
</del><ins>+ vm.interpreter->debug(exec, static_cast<DebugHookType>(debugHookType));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (206706 => 206707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-10-01 15:32:59 UTC (rev 206707)
</span><span class="lines">@@ -1498,8 +1498,8 @@
</span><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_debug)
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span><del>- int debugHookID = pc[1].u.operand;
- vm.interpreter->debug(exec, static_cast<DebugHookID>(debugHookID));
</del><ins>+ int debugHookType = pc[1].u.operand;
+ vm.interpreter->debug(exec, static_cast<DebugHookType>(debugHookType));
</ins><span class="cx">
</span><span class="cx"> LLINT_END();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>