diff options
Diffstat (limited to 'Source/JavaScriptCore/llint/LLIntExceptions.cpp')
| -rw-r--r-- | Source/JavaScriptCore/llint/LLIntExceptions.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.cpp b/Source/JavaScriptCore/llint/LLIntExceptions.cpp index ddacb5016..e0fbf8b7e 100644 --- a/Source/JavaScriptCore/llint/LLIntExceptions.cpp +++ b/Source/JavaScriptCore/llint/LLIntExceptions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2011, 2016 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,15 +25,17 @@ #include "config.h" #include "LLIntExceptions.h" - -#if ENABLE(LLINT) - #include "CallFrame.h" #include "CodeBlock.h" #include "Instruction.h" #include "LLIntCommon.h" +#include "LLIntData.h" #include "LowLevelInterpreter.h" -#include "Operations.h" +#include "JSCInlines.h" + +#if LLINT_SLOW_PATH_TRACING +#include "Exception.h" +#endif namespace JSC { namespace LLInt { @@ -48,7 +50,8 @@ Instruction* returnToThrow(ExecState* exec) UNUSED_PARAM(exec); #if LLINT_SLOW_PATH_TRACING VM* vm = &exec->vm(); - dataLog("Throwing exception ", vm->exception(), " (returnToThrow).\n"); + auto scope = DECLARE_THROW_SCOPE(*vm); + dataLog("Throwing exception ", JSValue(scope.exception()), " (returnToThrow).\n"); #endif return LLInt::exceptionInstructions(); } @@ -58,11 +61,10 @@ void* callToThrow(ExecState* exec) UNUSED_PARAM(exec); #if LLINT_SLOW_PATH_TRACING VM* vm = &exec->vm(); - dataLog("Throwing exception ", vm->exception(), " (callToThrow).\n"); + auto scope = DECLARE_THROW_SCOPE(*vm); + dataLog("Throwing exception ", JSValue(scope.exception()), " (callToThrow).\n"); #endif return LLInt::getCodePtr(llint_throw_during_call_trampoline); } } } // namespace JSC::LLInt - -#endif // ENABLE(LLINT) |