diff options
Diffstat (limited to 'Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp')
| -rw-r--r-- | Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp index d54f7a275..8b5568f2c 100644 --- a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp +++ b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Apple Inc. All rights reserved. + * Copyright (C) 2012, 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 @@ -29,16 +29,21 @@ #include "JSGlobalObject.h" #include "JSScope.h" #include "JSString.h" -#include "Operations.h" +#include "JSCInlines.h" #include <wtf/StringPrintStream.h> namespace JSC { namespace Profiler { JSValue OSRExitSite::toJS(ExecState* exec) const { + VM& vm = exec->vm(); + auto scope = DECLARE_THROW_SCOPE(vm); JSArray* result = constructEmptyArray(exec, 0); - for (unsigned i = 0; i < m_codeAddresses.size(); ++i) + RETURN_IF_EXCEPTION(scope, { }); + for (unsigned i = 0; i < m_codeAddresses.size(); ++i) { result->putDirectIndex(exec, i, jsString(exec, toString(RawPointer(m_codeAddresses[i])))); + RETURN_IF_EXCEPTION(scope, { }); + } return result; } |