Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (206706 => 206707)
--- trunk/Source/_javascript_Core/ChangeLog 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-10-01 15:32:59 UTC (rev 206707)
@@ -1,3 +1,23 @@
+2016-10-01 Joseph Pecoraro <[email protected]>
+
+ 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):
+
2016-09-30 Joseph Pecoraro <[email protected]>
Web Inspector: Stepping to a line with an autoContinue breakpoint should still pause
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (206706 => 206707)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-10-01 15:32:59 UTC (rev 206707)
@@ -299,9 +299,9 @@
return toCString(regexpToSourceString(regexp), "(@re", re, ")");
}
-NEVER_INLINE static const char* debugHookName(int debugHookID)
+NEVER_INLINE static const char* debugHookName(int debugHookType)
{
- switch (static_cast<DebugHookID>(debugHookID)) {
+ switch (static_cast<DebugHookType>(debugHookType)) {
case DidEnterCallFrame:
return "didEnterCallFrame";
case WillLeaveCallFrame:
@@ -1661,10 +1661,10 @@
break;
}
case op_debug: {
- int debugHookID = (++it)->u.operand;
+ int debugHookType = (++it)->u.operand;
int hasBreakpointFlag = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "debug");
- out.printf("%s, %d", debugHookName(debugHookID), hasBreakpointFlag);
+ out.printf("%s, %d", debugHookName(debugHookType), hasBreakpointFlag);
break;
}
case op_assert: {
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (206706 => 206707)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-10-01 15:32:59 UTC (rev 206707)
@@ -3459,7 +3459,7 @@
RELEASE_ASSERT(stackEntry.m_isWithScope);
}
-void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, const JSTextPosition& divot)
+void BytecodeGenerator::emitDebugHook(DebugHookType debugHookType, const JSTextPosition& divot)
{
if (!m_shouldEmitDebugHooks)
return;
@@ -3466,13 +3466,13 @@
emitExpressionInfo(divot, divot, divot);
emitOpcode(op_debug);
- instructions().append(debugHookID);
+ instructions().append(debugHookType);
instructions().append(false);
}
-void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, unsigned line, unsigned charOffset, unsigned lineStart)
+void BytecodeGenerator::emitDebugHook(DebugHookType debugHookType, unsigned line, unsigned charOffset, unsigned lineStart)
{
- emitDebugHook(debugHookID, JSTextPosition(line, charOffset, lineStart));
+ emitDebugHook(debugHookType, JSTextPosition(line, charOffset, lineStart));
}
void BytecodeGenerator::emitDebugHook(StatementNode* statement)
@@ -3481,10 +3481,10 @@
emitDebugHook(WillExecuteStatement, statement->position());
}
-void BytecodeGenerator::emitDebugHook(ExpressionNode* expr, DebugHookID debugHookID)
+void BytecodeGenerator::emitDebugHook(ExpressionNode* expr, DebugHookType debugHookType)
{
RELEASE_ASSERT(expr->needsDebugHook());
- emitDebugHook(debugHookID, expr->position());
+ emitDebugHook(debugHookType, expr->position());
}
void BytecodeGenerator::emitWillLeaveCallFrameDebugHook()
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (206706 => 206707)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2016-10-01 15:32:59 UTC (rev 206707)
@@ -676,10 +676,10 @@
void emitPutDerivedConstructorToArrowFunctionContextScope();
RegisterID* emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment();
- void emitDebugHook(DebugHookID, const JSTextPosition&);
- void emitDebugHook(DebugHookID, unsigned line, unsigned charOffset, unsigned lineStart);
+ void emitDebugHook(DebugHookType, const JSTextPosition&);
+ void emitDebugHook(DebugHookType, unsigned line, unsigned charOffset, unsigned lineStart);
void emitDebugHook(StatementNode*);
- void emitDebugHook(ExpressionNode*, DebugHookID);
+ void emitDebugHook(ExpressionNode*, DebugHookType);
void emitWillLeaveCallFrameDebugHook();
bool isInFinallyBlock() { return m_finallyDepth > 0; }
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (206706 => 206707)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2016-10-01 15:32:59 UTC (rev 206707)
@@ -1220,7 +1220,7 @@
return checkedReturn(result);
}
-NEVER_INLINE void Interpreter::debug(CallFrame* callFrame, DebugHookID debugHookID)
+NEVER_INLINE void Interpreter::debug(CallFrame* callFrame, DebugHookType debugHookType)
{
VM& vm = callFrame->vm();
auto scope = DECLARE_CATCH_SCOPE(vm);
@@ -1231,7 +1231,7 @@
ASSERT(callFrame->codeBlock()->hasDebuggerRequests());
ASSERT_UNUSED(scope, !scope.exception());
- switch (debugHookID) {
+ switch (debugHookType) {
case DidEnterCallFrame:
debugger->callEvent(callFrame);
break;
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.h (206706 => 206707)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.h 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.h 2016-10-01 15:32:59 UTC (rev 206707)
@@ -67,7 +67,7 @@
enum UnwindStart : uint8_t { UnwindFromCurrentFrame, UnwindFromCallerFrame };
- enum DebugHookID {
+ enum DebugHookType {
WillExecuteProgram,
DidExecuteProgram,
DidEnterCallFrame,
@@ -210,7 +210,7 @@
NEVER_INLINE HandlerInfo* unwind(VM&, CallFrame*&, Exception*, UnwindStart);
void notifyDebuggerOfExceptionToBeThrown(CallFrame*, Exception*);
- NEVER_INLINE void debug(CallFrame*, DebugHookID);
+ NEVER_INLINE void debug(CallFrame*, DebugHookType);
static JSString* stackTraceAsString(VM&, const Vector<StackFrame>&);
static EncodedJSValue JSC_HOST_CALL constructWithErrorConstructor(ExecState*);
Modified: trunk/Source/_javascript_Core/jit/JITOperations.cpp (206706 => 206707)
--- trunk/Source/_javascript_Core/jit/JITOperations.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/jit/JITOperations.cpp 2016-10-01 15:32:59 UTC (rev 206707)
@@ -1179,12 +1179,12 @@
throwTypeError(exec, scope, errorMessage);
}
-void JIT_OPERATION operationDebug(ExecState* exec, int32_t debugHookID)
+void JIT_OPERATION operationDebug(ExecState* exec, int32_t debugHookType)
{
VM& vm = exec->vm();
NativeCallFrameTracer tracer(&vm, exec);
- vm.interpreter->debug(exec, static_cast<DebugHookID>(debugHookID));
+ vm.interpreter->debug(exec, static_cast<DebugHookType>(debugHookType));
}
#if ENABLE(DFG_JIT)
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (206706 => 206707)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-10-01 03:59:23 UTC (rev 206706)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-10-01 15:32:59 UTC (rev 206707)
@@ -1498,8 +1498,8 @@
LLINT_SLOW_PATH_DECL(slow_path_debug)
{
LLINT_BEGIN();
- int debugHookID = pc[1].u.operand;
- vm.interpreter->debug(exec, static_cast<DebugHookID>(debugHookID));
+ int debugHookType = pc[1].u.operand;
+ vm.interpreter->debug(exec, static_cast<DebugHookType>(debugHookType));
LLINT_END();
}
