source: webkit/trunk/JavaScriptCore/kjs/JSActivation.h@ 37337

Last change on this file since 37337 was 37324, checked in by [email protected], 17 years ago

2008-10-05 Cameron Zwarich <[email protected]>

Reviewed by Oliver Hunt.

Bug 21364: Remove the branch in op_ret for OptionalCalleeActivation and OptionalCalleeArguments
<https://bugs.webkit.org/show_bug.cgi?id=21364>

Use information from the parser to detect whether an activation is
needed or 'arguments' is used, and emit explicit instructions to tear
them off before op_ret. This allows a branch to be removed from op_ret
and simplifies some other code. This does cause a small change in the
behaviour of 'f.arguments'; it is no longer live when 'arguments' is not
mentioned in the lexical scope of the function.

It should now be easy to remove the OptionaCalleeActivation slot in the
call frame, but this will be done in a later patch.

JavaScriptCore:

  • VM/CTI.cpp: (JSC::CTI::privateCompileMainPass):
  • VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
  • VM/CodeGenerator.cpp: (JSC::CodeGenerator::emitReturn):
  • VM/CodeGenerator.h:
  • VM/Machine.cpp: (JSC::Machine::unwindCallFrame): (JSC::Machine::privateExecute): (JSC::Machine::retrieveArguments): (JSC::Machine::cti_op_create_arguments): (JSC::Machine::cti_op_tear_off_activation): (JSC::Machine::cti_op_tear_off_arguments):
  • VM/Machine.h:
  • VM/Opcode.h:
  • kjs/Arguments.cpp: (JSC::Arguments::mark):
  • kjs/Arguments.h: (JSC::Arguments::isTornOff): (JSC::Arguments::Arguments): (JSC::Arguments::copyRegisters): (JSC::JSActivation::copyRegisters):
  • kjs/JSActivation.cpp: (JSC::JSActivation::argumentsGetter):
  • kjs/JSActivation.h:

LayoutTests:

  • fast/js/function-dot-arguments-expected.txt:
  • fast/js/resources/function-dot-arguments.js:
File size: 3.5 KB
Line 
1/*
2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#ifndef JSActivation_h
30#define JSActivation_h
31
32#include "CodeBlock.h"
33#include "JSVariableObject.h"
34#include "RegisterFile.h"
35#include "SymbolTable.h"
36#include "nodes.h"
37
38namespace JSC {
39
40 class Arguments;
41 class Register;
42
43 class JSActivation : public JSVariableObject {
44 typedef JSVariableObject Base;
45 public:
46 JSActivation(ExecState*, PassRefPtr<FunctionBodyNode>, Register*);
47 virtual ~JSActivation();
48
49 virtual void mark();
50
51 virtual bool isDynamicScope() const;
52
53 virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
54
55 virtual void put(ExecState*, const Identifier&, JSValue*, PutPropertySlot&);
56
57 virtual void putWithAttributes(ExecState*, const Identifier&, JSValue*, unsigned attributes);
58 virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
59
60 virtual JSObject* toThisObject(ExecState*) const;
61
62 void copyRegisters(Arguments* arguments);
63
64 virtual const ClassInfo* classInfo() const { return &info; }
65 static const ClassInfo info;
66
67 static PassRefPtr<StructureID> createStructureID(JSValue* proto) { return StructureID::create(proto, TypeInfo(ObjectType, NeedsThisConversion)); }
68
69 private:
70 struct JSActivationData : public JSVariableObjectData {
71 JSActivationData(PassRefPtr<FunctionBodyNode> functionBody, Register* registers)
72 : JSVariableObjectData(&functionBody->symbolTable(), registers)
73 , functionBody(functionBody)
74 {
75 }
76
77 RefPtr<FunctionBodyNode> functionBody;
78 };
79
80 static JSValue* argumentsGetter(ExecState*, const Identifier&, const PropertySlot&);
81 NEVER_INLINE PropertySlot::GetValueFunc getArgumentsGetter();
82
83 JSActivationData* d() const { return static_cast<JSActivationData*>(JSVariableObject::d); }
84 };
85
86} // namespace JSC
87
88#endif // JSActivation_h
Note: See TracBrowser for help on using the repository browser.