Modified: trunk/Source/_javascript_Core/ChangeLog (102193 => 102194)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-07 00:51:19 UTC (rev 102193)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-07 00:55:23 UTC (rev 102194)
@@ -1,3 +1,14 @@
+2011-12-06 Sam Weinig <s...@webkit.org>
+
+ Remove unintentional type name shadowing in the Interpreter
+ https://bugs.webkit.org/show_bug.cgi?id=73963
+
+ Reviewed by Oliver Hunt.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::prepareForRepeatCall): Replace the parameter name FunctionExecutable,
+ which shadows the FunctionExecutable type name, with functionExecutable.
+
2011-12-06 Michael Saboff <msab...@apple.com>
r102146 from 73875 broke fast/js/encode-URI-test.html
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (102193 => 102194)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2011-12-07 00:51:19 UTC (rev 102193)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2011-12-07 00:55:23 UTC (rev 102194)
@@ -1215,7 +1215,7 @@
return checkedReturn(asObject(result));
}
-CallFrameClosure Interpreter::prepareForRepeatCall(FunctionExecutable* FunctionExecutable, CallFrame* callFrame, JSFunction* function, int argumentCountIncludingThis, ScopeChainNode* scopeChain)
+CallFrameClosure Interpreter::prepareForRepeatCall(FunctionExecutable* functionExecutable, CallFrame* callFrame, JSFunction* function, int argumentCountIncludingThis, ScopeChainNode* scopeChain)
{
ASSERT(!scopeChain->globalData->exception);
@@ -1238,13 +1238,13 @@
for (int i = 0; i < argumentCountIncludingThis; ++i)
newCallFrame->uncheckedR(dst++) = jsUndefined();
- JSObject* error = FunctionExecutable->compileForCall(callFrame, scopeChain);
+ JSObject* error = functionExecutable->compileForCall(callFrame, scopeChain);
if (error) {
throwError(callFrame, error);
m_registerFile.shrink(oldEnd);
return CallFrameClosure();
}
- CodeBlock* codeBlock = &FunctionExecutable->generatedBytecodeForCall();
+ CodeBlock* codeBlock = &functionExecutable->generatedBytecodeForCall();
newCallFrame = slideRegisterWindowForCall(codeBlock, &m_registerFile, newCallFrame, argumentCountIncludingThis + RegisterFile::CallFrameHeaderSize, argumentCountIncludingThis);
if (UNLIKELY(!newCallFrame)) {
@@ -1254,7 +1254,7 @@
}
newCallFrame->init(codeBlock, 0, scopeChain, callFrame->addHostCallFrameFlag(), argumentCountIncludingThis, function);
scopeChain->globalData->topCallFrame = newCallFrame;
- CallFrameClosure result = { callFrame, newCallFrame, function, FunctionExecutable, scopeChain->globalData, oldEnd, scopeChain, codeBlock->m_numParameters, argumentCountIncludingThis };
+ CallFrameClosure result = { callFrame, newCallFrame, function, functionExecutable, scopeChain->globalData, oldEnd, scopeChain, codeBlock->m_numParameters, argumentCountIncludingThis };
return result;
}
