Changeset 63237 in webkit for trunk/JavaScriptCore/runtime/Executable.h

Timestamp:

Jul 13, 2010, 12:57:08 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-12 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

REGRESSION: Crash at JSC::JIT::privateCompile(JSC::MacroAssemblerCodePtr*)
​https://bugs.webkit.org/show_bug.cgi?id=41763

There are two parts to this patch, the first is to fix the actual
problem. When calling copyStringWithoutBOMs on a string we know
to contain BOMs we return a value indicating that there are no
BOMs.

The second part of this fix is simply to harden the path that
led to a crash when parsing failed.

• jit/JITOpcodes.cpp: (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):

Harden compilation stubs against parser failure.

• parser/Lexer.cpp: (JSC::Lexer::sourceCode):

Add assertions to ensure that subranges into a source provider
are always actually braces. Hopefully this should catch similar
failures in future. These assertions fire on existing tests
without this fix.

• runtime/Executable.h: (JSC::FunctionExecutable::tryJitCodeForCall): (JSC::FunctionExecutable::tryJitCodeForConstruct):
• wtf/text/StringImpl.h: (WebCore::StringImpl::copyStringWithoutBOMs):

Make copyStringWithBOMs do the right thing.

File:

• trunk/JavaScriptCore/runtime/Executable.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/Executable.h

@@ -415 +415 @@
             return m_jitCodeForConstruct;
         }
+        
+        bool tryJitCodeForCall(ExecState* exec, ScopeChainNode* scopeChainNode)
+        {
+            FunctionCodeBlock* codeBlock = bytecodeForCall(exec, scopeChainNode);
+            if (!codeBlock)
+                return false;
+            if (!m_jitCodeForCall)
+                generateJITCodeForCall(exec, scopeChainNode);
+            return true;
+        }
+        
+        bool tryJitCodeForConstruct(ExecState* exec, ScopeChainNode* scopeChainNode)
+        {
+            FunctionCodeBlock* codeBlock = bytecodeForConstruct(exec, scopeChainNode);
+            if (!codeBlock)
+                return false;
+            if (!m_jitCodeForConstruct)
+                generateJITCodeForConstruct(exec, scopeChainNode);
+            return true;
+        }
 
         MacroAssemblerCodePtr generatedJITCodeForCallWithArityCheck()