From 0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 1 Jun 2017 15:54:01 +0300 Subject: Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31 Change-Id: I480668a0cb8114dccf7a1195190a993282875759 Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/jit/JITPropertyAccess.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Source/JavaScriptCore/jit/JITPropertyAccess.cpp') diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp index 3781c1df2..8b6d6ecc3 100644 --- a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp +++ b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp @@ -1256,6 +1256,8 @@ void JIT::privateCompileGetByValWithCachedId(ByValInfo* byValInfo, ReturnAddress patchBuffer.link(slowCases, CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath)); patchBuffer.link(fastDoneCase, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone)); patchBuffer.link(slowDoneCase, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToNextHotPath)); + if (!m_exceptionChecks.empty()) + patchBuffer.link(m_exceptionChecks, byValInfo->exceptionHandler); for (const auto& callSite : m_calls) { if (callSite.to) @@ -1344,6 +1346,9 @@ void JIT::privateCompilePutByValWithCachedId(ByValInfo* byValInfo, ReturnAddress LinkBuffer patchBuffer(*m_vm, *this, m_codeBlock); patchBuffer.link(slowCases, CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath)); patchBuffer.link(doneCases, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone)); + if (!m_exceptionChecks.empty()) + patchBuffer.link(m_exceptionChecks, byValInfo->exceptionHandler); + for (const auto& callSite : m_calls) { if (callSite.to) patchBuffer.link(callSite.from, FunctionPtr(callSite.to)); -- cgit v1.2.1