Changeset 33345

Show
Ignore:
Timestamp:
05/12/08 23:04:23 (6 months ago)
Author:
mrowe@apple.com
Message:

Fix call frame set up for native -> JS function calls.

Review by Geoff

Location:
branches/squirrelfish/JavaScriptCore
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/squirrelfish/JavaScriptCore/ChangeLog

    r33344 r33345  
     12008-05-05  Oliver Hunt  <oliver@apple.com> 
     2 
     3        Reviewed by Geoff. 
     4 
     5        Fix call frame set up for native -> JS function calls. 
     6 
     7        * VM/Machine.cpp: 
     8        (KJS::Machine::execute): 
     9 
    1102008-05-05  Geoffrey Garen  <ggaren@apple.com> 
    211 

  • branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

    r33344 r33345  
    619619 
    620620    // put call frame in place, using a 0 codeBlock to indicate a built-in caller 
    621     initializeCallFrame(callFrame, 0, 0, 0, registerOffset, 0, registerOffset + CallFrameHeaderSize, argc, 0, function); 
     621    initializeCallFrame(callFrame, 0, 0, 0, registerOffset, 0, argv, argc, 0, function); 
    622622 
    623623    CodeBlock* newCodeBlock = &functionBodyNode->code(scopeChain);