diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /JavaScriptCore/runtime/Executable.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'JavaScriptCore/runtime/Executable.h')
| -rw-r--r-- | JavaScriptCore/runtime/Executable.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/JavaScriptCore/runtime/Executable.h b/JavaScriptCore/runtime/Executable.h index 39ddf49..3320fe1 100644 --- a/JavaScriptCore/runtime/Executable.h +++ b/JavaScriptCore/runtime/Executable.h @@ -305,12 +305,12 @@ namespace JSC { return *m_codeBlockForConstruct; } - FunctionCodeBlock& bytecodeForCall(ExecState* exec, ScopeChainNode* scopeChainNode) + FunctionCodeBlock* bytecodeForCall(ExecState* exec, ScopeChainNode* scopeChainNode) { ASSERT(scopeChainNode); if (!m_codeBlockForCall) compileForCall(exec, scopeChainNode); - return *m_codeBlockForCall; + return m_codeBlockForCall; } bool isGeneratedForCall() const @@ -324,12 +324,12 @@ namespace JSC { return *m_codeBlockForCall; } - FunctionCodeBlock& bytecodeForConstruct(ExecState* exec, ScopeChainNode* scopeChainNode) + FunctionCodeBlock* bytecodeForConstruct(ExecState* exec, ScopeChainNode* scopeChainNode) { ASSERT(scopeChainNode); if (!m_codeBlockForConstruct) compileForConstruct(exec, scopeChainNode); - return *m_codeBlockForConstruct; + return m_codeBlockForConstruct; } bool isGeneratedForConstruct() const @@ -383,8 +383,8 @@ namespace JSC { m_lastLine = lastLine; } - void compileForCall(ExecState*, ScopeChainNode*); - void compileForConstruct(ExecState*, ScopeChainNode*); + bool compileForCall(ExecState*, ScopeChainNode*); + bool compileForConstruct(ExecState*, ScopeChainNode*); unsigned m_numVariables : 31; bool m_forceUsesArguments : 1; |