From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp') diff --git a/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp b/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp index 55334be2f..4077a8bd4 100644 --- a/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp +++ b/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013, 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 @@ -28,8 +28,14 @@ #include "CallFrame.h" #include "CodeBlock.h" +#include "Interpreter.h" #include "JITExceptions.h" #include "LLIntCommon.h" +#include "JSCInlines.h" + +#if LLINT_SLOW_PATH_TRACING +#include "Exception.h" +#endif namespace JSC { namespace CommonSlowPaths { @@ -37,9 +43,11 @@ void interpreterThrowInCaller(ExecState* exec, JSObject* error) { VM* vm = &exec->vm(); NativeCallFrameTracer tracer(vm, exec); - vm->throwException(exec, error); + auto scope = DECLARE_THROW_SCOPE(*vm); + + throwException(exec, scope, error); #if LLINT_SLOW_PATH_TRACING - dataLog("Throwing exception ", vm->exception(), ".\n"); + dataLog("Throwing exception ", JSValue(scope.exception()), ".\n"); #endif } -- cgit v1.2.1