Commit fdeded83 authored by pewtermoose@webkit.org's avatar pewtermoose@webkit.org
Browse files

2008-11-02 Matt Lilek <webkit@mattlilek.com>

        Reviewed by Cameron Zwarich.

        Bug 22042: REGRESSION(r38066): ASSERTION FAILED: source in CodeBlock
        <https://bugs.webkit.org/show_bug.cgi?id=22042>

        Rename parameter name to avoid ASSERT.

        * VM/CodeBlock.h:
        (JSC::CodeBlock::CodeBlock):
        (JSC::ProgramCodeBlock::ProgramCodeBlock):
        (JSC::EvalCodeBlock::EvalCodeBlock):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38068 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fb968c68
2008-11-02 Matt Lilek <webkit@mattlilek.com>
Reviewed by Cameron Zwarich.
Bug 22042: REGRESSION(r38066): ASSERTION FAILED: source in CodeBlock
<https://bugs.webkit.org/show_bug.cgi?id=22042>
Rename parameter name to avoid ASSERT.
* VM/CodeBlock.h:
(JSC::CodeBlock::CodeBlock):
(JSC::ProgramCodeBlock::ProgramCodeBlock):
(JSC::EvalCodeBlock::EvalCodeBlock):
2008-11-02 Cameron Zwarich <zwarich@apple.com>
 
Reviewed by Oliver Hunt.
......
......@@ -245,7 +245,7 @@ namespace JSC {
};
struct CodeBlock {
CodeBlock(ScopeNode* ownerNode, CodeType codeType, PassRefPtr<SourceProvider> source, unsigned sourceOffset)
CodeBlock(ScopeNode* ownerNode, CodeType codeType, PassRefPtr<SourceProvider> sourceProvider, unsigned sourceOffset)
: ownerNode(ownerNode)
, globalData(0)
#if ENABLE(CTI)
......@@ -258,7 +258,7 @@ namespace JSC {
, needsFullScopeChain(ownerNode->needsActivation())
, usesEval(ownerNode->usesEval())
, codeType(codeType)
, source(source)
, source(sourceProvider)
, sourceOffset(sourceOffset)
{
ASSERT(source);
......@@ -371,8 +371,8 @@ namespace JSC {
// responsible for marking it.
struct ProgramCodeBlock : public CodeBlock {
ProgramCodeBlock(ScopeNode* ownerNode, CodeType codeType, JSGlobalObject* globalObject, PassRefPtr<SourceProvider> source)
: CodeBlock(ownerNode, codeType, source, 0)
ProgramCodeBlock(ScopeNode* ownerNode, CodeType codeType, JSGlobalObject* globalObject, PassRefPtr<SourceProvider> sourceProvider)
: CodeBlock(ownerNode, codeType, sourceProvider, 0)
, globalObject(globalObject)
{
globalObject->codeBlocks().add(this);
......@@ -388,8 +388,8 @@ namespace JSC {
};
struct EvalCodeBlock : public ProgramCodeBlock {
EvalCodeBlock(ScopeNode* ownerNode, JSGlobalObject* globalObject, PassRefPtr<SourceProvider> source)
: ProgramCodeBlock(ownerNode, EvalCode, globalObject, source)
EvalCodeBlock(ScopeNode* ownerNode, JSGlobalObject* globalObject, PassRefPtr<SourceProvider> sourceProvider)
: ProgramCodeBlock(ownerNode, EvalCode, globalObject, sourceProvider)
{
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment