diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/JavaScriptCore/interpreter | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/JavaScriptCore/interpreter')
| -rw-r--r-- | Source/JavaScriptCore/interpreter/Interpreter.cpp | 13 | ||||
| -rw-r--r-- | Source/JavaScriptCore/interpreter/RegisterFile.h | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Source/JavaScriptCore/interpreter/Interpreter.cpp b/Source/JavaScriptCore/interpreter/Interpreter.cpp index 57c068a..cf9f8a1 100644 --- a/Source/JavaScriptCore/interpreter/Interpreter.cpp +++ b/Source/JavaScriptCore/interpreter/Interpreter.cpp @@ -35,7 +35,7 @@ #include "CallFrame.h" #include "CallFrameClosure.h" #include "CodeBlock.h" -#include "Collector.h" +#include "Heap.h" #include "Debugger.h" #include "DebuggerCallFrame.h" #include "ErrorInstance.h" @@ -4632,17 +4632,6 @@ skip_id_custom_self: exceptionValue = JSValue(createReferenceError(callFrame, message)); goto vm_throw; } - DEFINE_OPCODE(op_throw_syntax_error) { - /* op_throw_syntax_error message(k) - - Constructs a new syntax Error instance using the - original constructor, using constant message as the - message string. The result is thrown. - */ - UString message = callFrame->r(vPC[1].u.operand).jsValue().toString(callFrame); - exceptionValue = JSValue(createSyntaxError(callFrame, message)); - goto vm_throw; - } DEFINE_OPCODE(op_end) { /* end result(r) diff --git a/Source/JavaScriptCore/interpreter/RegisterFile.h b/Source/JavaScriptCore/interpreter/RegisterFile.h index 51a5bdf..f2e6553 100644 --- a/Source/JavaScriptCore/interpreter/RegisterFile.h +++ b/Source/JavaScriptCore/interpreter/RegisterFile.h @@ -29,7 +29,7 @@ #ifndef RegisterFile_h #define RegisterFile_h -#include "Collector.h" +#include "Heap.h" #include "ExecutableAllocator.h" #include "Register.h" #include "WeakGCPtr.h" |