From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 24 May 2016 08:28:08 +0000 Subject: webkitgtk-2.12.3 --- Source/JavaScriptCore/ftl/FTLOSREntry.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'Source/JavaScriptCore/ftl/FTLOSREntry.cpp') diff --git a/Source/JavaScriptCore/ftl/FTLOSREntry.cpp b/Source/JavaScriptCore/ftl/FTLOSREntry.cpp index 185046054..601b46094 100644 --- a/Source/JavaScriptCore/ftl/FTLOSREntry.cpp +++ b/Source/JavaScriptCore/ftl/FTLOSREntry.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013, 2014 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,17 +32,20 @@ #include "FTLForOSREntryJITCode.h" #include "JSStackInlines.h" #include "OperandsInlines.h" +#include "JSCInlines.h" #if ENABLE(FTL_JIT) namespace JSC { namespace FTL { +SUPPRESS_ASAN void* prepareOSREntry( ExecState* exec, CodeBlock* dfgCodeBlock, CodeBlock* entryCodeBlock, unsigned bytecodeIndex, unsigned streamIndex) { VM& vm = exec->vm(); CodeBlock* baseline = dfgCodeBlock->baselineVersion(); + ExecutableBase* executable = dfgCodeBlock->ownerExecutable(); DFG::JITCode* dfgCode = dfgCodeBlock->jitCode()->dfg(); ForOSREntryJITCode* entryCode = entryCodeBlock->jitCode()->ftlForOSREntry(); @@ -52,9 +55,12 @@ void* prepareOSREntry( bytecodeIndex, ".\n"); } + if (bytecodeIndex) + jsCast(executable)->setDidTryToEnterInLoop(true); + if (bytecodeIndex != entryCode->bytecodeIndex()) { if (Options::verboseOSR()) - dataLog(" OSR failed because we don't have an entrypoint for bc#", bytecodeIndex, "; ours is for bc#", entryCode->bytecodeIndex()); + dataLog(" OSR failed because we don't have an entrypoint for bc#", bytecodeIndex, "; ours is for bc#", entryCode->bytecodeIndex(), "\n"); return 0; } @@ -66,12 +72,18 @@ void* prepareOSREntry( dataLog(" Values at entry: ", values, "\n"); for (int argument = values.numberOfArguments(); argument--;) { - RELEASE_ASSERT( - exec->r(virtualRegisterForArgument(argument).offset()).jsValue() == values.argument(argument)); + JSValue valueOnStack = exec->r(virtualRegisterForArgument(argument).offset()).asanUnsafeJSValue(); + JSValue reconstructedValue = values.argument(argument); + if (valueOnStack == reconstructedValue || !argument) + continue; + dataLog("Mismatch between reconstructed values and the the value on the stack for argument arg", argument, " for ", *entryCodeBlock, " at bc#", bytecodeIndex, ":\n"); + dataLog(" Value on stack: ", valueOnStack, "\n"); + dataLog(" Reconstructed value: ", reconstructedValue, "\n"); + RELEASE_ASSERT_NOT_REACHED(); } RELEASE_ASSERT( - static_cast(values.numberOfLocals()) == baseline->m_numCalleeRegisters); + static_cast(values.numberOfLocals()) == baseline->m_numCalleeLocals); EncodedJSValue* scratch = static_cast( entryCode->entryBuffer()->dataBuffer()); @@ -80,7 +92,7 @@ void* prepareOSREntry( scratch[local] = JSValue::encode(values.local(local)); int stackFrameSize = entryCode->common.requiredRegisterCountForExecutionAndExit(); - if (!vm.interpreter->stack().grow(&exec->registers()[virtualRegisterForLocal(stackFrameSize).offset()])) { + if (!vm.interpreter->stack().ensureCapacityFor(&exec->registers()[virtualRegisterForLocal(stackFrameSize - 1).offset()])) { if (Options::verboseOSR()) dataLog(" OSR failed because stack growth failed.\n"); return 0; @@ -88,7 +100,7 @@ void* prepareOSREntry( exec->setCodeBlock(entryCodeBlock); - void* result = entryCode->addressForCall().executableAddress(); + void* result = entryCode->addressForCall(ArityCheckNotRequired).executableAddress(); if (Options::verboseOSR()) dataLog(" Entry will succeed, going to address", RawPointer(result), "\n"); -- cgit v1.2.1