/*
- * Copyright (C) 2008, 2009, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009, 2012, 2013, 2014 Apple Inc. All rights reserved.
* Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>
* Copyright (C) 2012 Igalia, S.L.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
#include "Nodes.h"
#include "StaticPropertyAnalyzer.h"
#include "UnlinkedCodeBlock.h"
+
+#include <functional>
+
#include <wtf/PassRefPtr.h>
#include <wtf/SegmentedVector.h>
#include <wtf/Vector.h>
+
namespace JSC {
class Identifier;
class Label;
- class JSScope;
enum ExpectedFunction {
NoExpectedFunction,
class CallArguments {
public:
- CallArguments(BytecodeGenerator& generator, ArgumentsNode* argumentsNode);
+ CallArguments(BytecodeGenerator&, ArgumentsNode*, unsigned additionalArguments = 0);
RegisterID* thisRegister() { return m_argv[0].get(); }
RegisterID* argumentRegister(unsigned i) { return m_argv[i + 1].get(); }
- unsigned registerOffset() { return m_argv.last()->index() + CallFrame::offsetFor(argumentCountIncludingThis()); }
- unsigned argumentCountIncludingThis() { return m_argv.size(); }
+ unsigned stackOffset() { return -m_argv[0]->index() + JSStack::CallFrameHeaderSize; }
+ unsigned argumentCountIncludingThis() { return m_argv.size() - m_padding; }
RegisterID* profileHookRegister() { return m_profileHookRegister.get(); }
ArgumentsNode* argumentsNode() { return m_argumentsNode; }
private:
- void newArgument(BytecodeGenerator&);
-
RefPtr<RegisterID> m_profileHookRegister;
ArgumentsNode* m_argumentsNode;
Vector<RefPtr<RegisterID>, 8, UnsafeVectorOverflow> m_argv;
+ unsigned m_padding;
};
struct FinallyContext {
TryData* tryData;
};
- struct TryRange {
- RefPtr<Label> start;
- RefPtr<Label> end;
- TryData* tryData;
+ enum CaptureMode {
+ NotCaptured,
+ IsCaptured
};
- class ResolveResult {
+ class Local {
public:
- enum Flags {
- // The property is locally bound, in a register.
- RegisterFlag = 0x1,
- // We need to traverse the scope chain at runtime, checking for
- // non-strict eval and/or `with' nodes.
- DynamicFlag = 0x2,
- // The resolved binding is immutable.
- ReadOnlyFlag = 0x4,
- // The property has a static location
- StaticFlag = 0x8,
- // Entry at scope distance "m_depth" and located at "m_index"
- ScopedFlag = 0x10
- };
-
- enum Type {
- // The property is local, and stored in a register.
- Register = RegisterFlag | StaticFlag,
- // A read-only local, created by "const".
- ReadOnlyRegister = RegisterFlag | ReadOnlyFlag | StaticFlag,
- // Lexically fixed location in the scope chain
- Lexical = ScopedFlag | StaticFlag,
- // A read-only Lexical, created by "const".
- ReadOnlyLexical = ScopedFlag | ReadOnlyFlag | StaticFlag,
- // Any other form of lookup
- Dynamic = DynamicFlag,
- };
-
- static ResolveResult registerResolve(RegisterID *local, unsigned flags)
- {
- return ResolveResult(Register | flags, local);
- }
- static ResolveResult dynamicResolve()
+ Local()
+ : m_local(0)
+ , m_attributes(0)
{
- return ResolveResult(Dynamic, 0);
}
- static ResolveResult lexicalResolve(int index, size_t depth, unsigned flags)
+
+ Local(RegisterID* local, unsigned attributes, CaptureMode captureMode)
+ : m_local(local)
+ , m_attributes(attributes)
+ , m_isCaptured(captureMode == IsCaptured)
{
- if (flags & DynamicFlag)
- return dynamicResolve();
- return ResolveResult(Lexical | flags, index, depth);
}
- unsigned type() const { return m_type; }
- // Returns the register corresponding to a local variable, or 0 if no
- // such register exists. Registers returned by ResolveResult::local() do
- // not require explicit reference counting.
- RegisterID* local() const { return m_local; }
+ operator bool() { return m_local; }
- bool isRegister() const { return m_type & RegisterFlag; }
- bool isStatic() const { return (m_type & StaticFlag) && !isDynamic(); }
- bool isDynamic() const { return m_type & DynamicFlag; }
- bool isReadOnly() const { return (m_type & ReadOnlyFlag) && !isDynamic(); }
+ RegisterID* get() { return m_local; }
- unsigned depth() const { ASSERT(isStatic()); return m_depth; }
- int32_t index() const { ASSERT(isStatic()); return m_index; }
+ bool isReadOnly() { return m_attributes & ReadOnly; }
+
+ bool isCaptured() { return m_isCaptured; }
+ CaptureMode captureMode() { return isCaptured() ? IsCaptured : NotCaptured; }
private:
- ResolveResult(unsigned type, RegisterID* local)
- : m_type(type)
- , m_local(local)
- , m_index(0)
- , m_depth(0)
- {
-#ifndef NDEBUG
- checkValidity();
-#endif
- }
-
- ResolveResult(unsigned type, int index, unsigned depth)
- : m_type(type)
- , m_local(0)
- , m_index(index)
- , m_depth(depth)
- {
-#ifndef NDEBUG
- checkValidity();
-#endif
- }
-
-#ifndef NDEBUG
- void checkValidity();
-#endif
-
- unsigned m_type;
- RegisterID* m_local; // Local register, if RegisterFlag is set
- int m_index;
- unsigned m_depth;
+ RegisterID* m_local;
+ unsigned m_attributes;
+ bool m_isCaptured;
};
- struct NonlocalResolveInfo {
- friend class BytecodeGenerator;
- NonlocalResolveInfo()
- : m_state(Unused)
- {
- }
- ~NonlocalResolveInfo()
- {
- ASSERT(m_state == Put);
- }
- private:
- void resolved(uint32_t putToBaseIndex)
- {
- ASSERT(putToBaseIndex);
- ASSERT(m_state == Unused);
- m_state = Resolved;
- m_putToBaseIndex = putToBaseIndex;
- }
- uint32_t put()
- {
- ASSERT(m_state == Resolved);
- m_state = Put;
- return m_putToBaseIndex;
- }
- enum State { Unused, Resolved, Put };
- State m_state;
- uint32_t m_putToBaseIndex;
+ struct TryRange {
+ RefPtr<Label> start;
+ RefPtr<Label> end;
+ TryData* tryData;
};
class BytecodeGenerator {
typedef DeclarationStacks::VarStack VarStack;
typedef DeclarationStacks::FunctionStack FunctionStack;
- BytecodeGenerator(VM&, JSScope*, ProgramNode*, UnlinkedProgramCodeBlock*, DebuggerMode, ProfilerMode);
- BytecodeGenerator(VM&, JSScope*, FunctionBodyNode*, UnlinkedFunctionCodeBlock*, DebuggerMode, ProfilerMode);
- BytecodeGenerator(VM&, JSScope*, EvalNode*, UnlinkedEvalCodeBlock*, DebuggerMode, ProfilerMode);
+ BytecodeGenerator(VM&, ProgramNode*, UnlinkedProgramCodeBlock*, DebuggerMode, ProfilerMode);
+ BytecodeGenerator(VM&, FunctionBodyNode*, UnlinkedFunctionCodeBlock*, DebuggerMode, ProfilerMode);
+ BytecodeGenerator(VM&, EvalNode*, UnlinkedEvalCodeBlock*, DebuggerMode, ProfilerMode);
~BytecodeGenerator();
bool willResolveToArguments(const Identifier&);
RegisterID* uncheckedRegisterForArguments();
- // Resolve an identifier, given the current compile-time scope chain.
- ResolveResult resolve(const Identifier&);
- // Behaves as resolve does, but ignores dynamic scope as
- // dynamic scope should not interfere with const initialisation
- ResolveResult resolveConstDecl(const Identifier&);
+ bool isCaptured(int operand);
+ CaptureMode captureMode(int operand) { return isCaptured(operand) ? IsCaptured : NotCaptured; }
+
+ Local local(const Identifier&);
+ Local constLocal(const Identifier&);
// Returns the register storing "this"
RegisterID* thisRegister() { return &m_thisRegister; }
return newTemporary();
}
- // Returns the place to write the final output of an operation.
- RegisterID* finalDestinationOrIgnored(RegisterID* originalDst, RegisterID* tempDst = 0)
- {
- if (originalDst)
- return originalDst;
- ASSERT(tempDst != ignoredResult());
- if (tempDst && tempDst->isTemporary())
- return tempDst;
- return newTemporary();
- }
-
RegisterID* destinationForAssignResult(RegisterID* dst)
{
if (dst && dst != ignoredResult() && m_codeBlock->needsFullScopeChain())
{
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
- if (!m_stack.isSafeToRecurse()) {
+ // Should never store directly into a captured variable.
+ ASSERT(!dst || dst == ignoredResult() || !isCaptured(dst->index()));
+ if (!m_vm->isSafeToRecurse()) {
emitThrowExpressionTooDeepException();
return;
}
{
// Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
- if (!m_stack.isSafeToRecurse())
+ // Should never store directly into a captured variable.
+ ASSERT(!dst || dst == ignoredResult() || !isCaptured(dst->index()));
+ if (!m_vm->isSafeToRecurse())
return emitThrowExpressionTooDeepException();
return n->emitBytecode(*this, dst);
}
void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, FallThroughMode fallThroughMode)
{
- if (!m_stack.isSafeToRecurse()) {
+ if (!m_vm->isSafeToRecurse()) {
emitThrowExpressionTooDeepException();
return;
}
n->emitBytecodeInConditionContext(*this, trueTarget, falseTarget, fallThroughMode);
}
- void emitExpressionInfo(int divot, int startOffset, int endOffset, unsigned line, int lineStart)
- {
+ void emitExpressionInfo(const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd)
+ {
+ ASSERT(divot.offset >= divotStart.offset);
+ ASSERT(divotEnd.offset >= divot.offset);
+
int sourceOffset = m_scopeNode->source().startOffset();
unsigned firstLine = m_scopeNode->source().firstLine();
- ASSERT(divot >= lineStart);
- ASSERT(divot >= sourceOffset);
- divot -= sourceOffset;
+ int divotOffset = divot.offset - sourceOffset;
+ int startOffset = divot.offset - divotStart.offset;
+ int endOffset = divotEnd.offset - divot.offset;
+ unsigned line = divot.line;
+ ASSERT(line >= firstLine);
+ line -= firstLine;
+
+ int lineStart = divot.lineStartOffset;
if (lineStart > sourceOffset)
lineStart -= sourceOffset;
else
lineStart = 0;
- ASSERT(line >= firstLine);
- line -= firstLine;
+ if (divotOffset < lineStart)
+ return;
+
+ unsigned column = divotOffset - lineStart;
unsigned instructionOffset = instructions().size();
- ASSERT(divot >= lineStart);
- unsigned column = divot - lineStart;
- m_codeBlock->addExpressionInfo(instructionOffset, divot, startOffset, endOffset, line, column);
+ if (!m_isBuiltinFunction)
+ m_codeBlock->addExpressionInfo(instructionOffset, divotOffset, startOffset, endOffset, line, column);
}
ALWAYS_INLINE bool leftHandSideNeedsCopy(bool rightHasAssignments, bool rightIsPure)
RegisterID* emitNewObject(RegisterID* dst);
RegisterID* emitNewArray(RegisterID* dst, ElementNode*, unsigned length); // stops at first elision
- RegisterID* emitNewFunction(RegisterID* dst, FunctionBodyNode* body);
+ RegisterID* emitNewFunction(RegisterID* dst, CaptureMode, FunctionBodyNode*);
RegisterID* emitLazyNewFunction(RegisterID* dst, FunctionBodyNode* body);
- RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index, bool shouldNullCheck);
+ RegisterID* emitNewFunctionInternal(RegisterID* dst, CaptureMode, unsigned index, bool shouldNullCheck);
RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
RegisterID* emitNewRegExp(RegisterID* dst, RegExp*);
+ RegisterID* emitMove(RegisterID* dst, CaptureMode, RegisterID* src);
RegisterID* emitMove(RegisterID* dst, RegisterID* src);
RegisterID* emitToNumber(RegisterID* dst, RegisterID* src) { return emitUnaryOp(op_to_number, dst, src); }
RegisterID* emitTypeOf(RegisterID* dst, RegisterID* src) { return emitUnaryOp(op_typeof, dst, src); }
RegisterID* emitIn(RegisterID* dst, RegisterID* property, RegisterID* base) { return emitBinaryOp(op_in, dst, property, base, OperandTypes()); }
- RegisterID* emitGetStaticVar(RegisterID* dst, const ResolveResult&, const Identifier&);
- RegisterID* emitPutStaticVar(const ResolveResult&, const Identifier&, RegisterID* value);
RegisterID* emitInitGlobalConst(const Identifier&, RegisterID* value);
- RegisterID* emitResolve(RegisterID* dst, const ResolveResult&, const Identifier& property);
- RegisterID* emitResolveBase(RegisterID* dst, const ResolveResult&, const Identifier& property);
- RegisterID* emitResolveBaseForPut(RegisterID* dst, const ResolveResult&, const Identifier& property, NonlocalResolveInfo&);
- RegisterID* emitResolveWithBaseForPut(RegisterID* baseDst, RegisterID* propDst, const ResolveResult&, const Identifier& property, NonlocalResolveInfo&);
- RegisterID* emitResolveWithThis(RegisterID* baseDst, RegisterID* propDst, const ResolveResult&, const Identifier& property);
-
- RegisterID* emitPutToBase(RegisterID* base, const Identifier&, RegisterID* value, NonlocalResolveInfo&);
-
RegisterID* emitGetById(RegisterID* dst, RegisterID* base, const Identifier& property);
RegisterID* emitGetArgumentsLength(RegisterID* dst, RegisterID* base);
RegisterID* emitPutById(RegisterID* base, const Identifier& property, RegisterID* value);
RegisterID* emitGetByVal(RegisterID* dst, RegisterID* base, RegisterID* property);
RegisterID* emitGetArgumentByVal(RegisterID* dst, RegisterID* base, RegisterID* property);
RegisterID* emitPutByVal(RegisterID* base, RegisterID* property, RegisterID* value);
+ RegisterID* emitDirectPutByVal(RegisterID* base, RegisterID* property, RegisterID* value);
RegisterID* emitDeleteByVal(RegisterID* dst, RegisterID* base, RegisterID* property);
RegisterID* emitPutByIndex(RegisterID* base, unsigned index, RegisterID* value);
void emitPutGetterSetter(RegisterID* base, const Identifier& property, RegisterID* getter, RegisterID* setter);
ExpectedFunction expectedFunctionForIdentifier(const Identifier&);
- RegisterID* emitCall(RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, unsigned divot, unsigned startOffset, unsigned endOffset, unsigned line, unsigned lineStart);
- RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, CallArguments&, unsigned divot, unsigned startOffset, unsigned endOffset, unsigned line, unsigned lineStart);
- RegisterID* emitCallVarargs(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, RegisterID* arguments, RegisterID* firstFreeRegister, RegisterID* profileHookRegister, unsigned divot, unsigned startOffset, unsigned endOffset, unsigned line, unsigned lineStart);
- RegisterID* emitLoadVarargs(RegisterID* argCountDst, RegisterID* thisRegister, RegisterID* args);
+ RegisterID* emitCall(RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
+ RegisterID* emitCallEval(RegisterID* dst, RegisterID* func, CallArguments&, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
+ RegisterID* emitCallVarargs(RegisterID* dst, RegisterID* func, RegisterID* thisRegister, RegisterID* arguments, RegisterID* firstFreeRegister, int32_t firstVarArgOffset, RegisterID* profileHookRegister, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
+ void emitEnumeration(ThrowableExpressionData* enumerationNode, ExpressionNode* subjectNode, const std::function<void(BytecodeGenerator&, RegisterID*)>& callBack);
+
RegisterID* emitReturn(RegisterID* src);
RegisterID* emitEnd(RegisterID* src) { return emitUnaryNoDstOp(op_end, src); }
- RegisterID* emitConstruct(RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, unsigned divot, unsigned startOffset, unsigned endOffset, unsigned line, unsigned lineStart);
+ RegisterID* emitConstruct(RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
RegisterID* emitStrcat(RegisterID* dst, RegisterID* src, int count);
void emitToPrimitive(RegisterID* dst, RegisterID* src);
+ ResolveType resolveType();
+ RegisterID* emitResolveScope(RegisterID* dst, const Identifier&);
+ RegisterID* emitGetFromScope(RegisterID* dst, RegisterID* scope, const Identifier&, ResolveMode);
+ RegisterID* emitPutToScope(RegisterID* scope, const Identifier&, RegisterID* value, ResolveMode);
+
PassRefPtr<Label> emitLabel(Label*);
void emitLoopHint();
PassRefPtr<Label> emitJump(Label* target);
void emitThrowReferenceError(const String& message);
- void emitPushNameScope(const Identifier& property, RegisterID* value, unsigned attributes);
+ void emitPushFunctionNameScope(const Identifier& property, RegisterID* value, unsigned attributes);
+ void emitPushCatchScope(const Identifier& property, RegisterID* value, unsigned attributes);
RegisterID* emitPushWithScope(RegisterID* scope);
void emitPopScope();
- void emitDebugHook(DebugHookID, unsigned firstLine, unsigned lastLine, unsigned charOffset, unsigned lineStart);
+ void emitDebugHook(DebugHookID, unsigned line, unsigned charOffset, unsigned lineStart);
- int scopeDepth() { return m_dynamicScopeDepth + m_finallyDepth; }
+ int scopeDepth() { return m_localScopeDepth + m_finallyDepth; }
bool hasFinaliser() { return m_finallyDepth != 0; }
void pushFinallyContext(StatementNode* finallyBlock);
void popFinallyContext();
- void pushOptimisedForIn(RegisterID* expectedBase, RegisterID* iter, RegisterID* index, RegisterID* propertyRegister)
+ void pushOptimisedForIn(RegisterID* expectedSubscript, RegisterID* iter, RegisterID* index, RegisterID* propertyRegister)
{
- ForInContext context = { expectedBase, iter, index, propertyRegister };
+ ForInContext context = { expectedSubscript, iter, index, propertyRegister };
m_forInContextStack.append(context);
}
m_forInContextStack.removeLast();
}
- LabelScope* breakTarget(const Identifier&);
- LabelScope* continueTarget(const Identifier&);
+ LabelScopePtr breakTarget(const Identifier&);
+ LabelScopePtr continueTarget(const Identifier&);
void beginSwitch(RegisterID*, SwitchInfo::SwitchType);
void endSwitch(uint32_t clauseCount, RefPtr<Label>*, ExpressionNode**, Label* defaultLabel, int32_t min, int32_t range);
bool shouldEmitDebugHooks() { return m_shouldEmitDebugHooks; }
bool isStrictMode() const { return m_codeBlock->isStrictMode(); }
-
+
+ bool isBuiltinFunction() const { return m_isBuiltinFunction; }
+
private:
friend class Label;
typedef HashMap<double, JSValue> NumberMap;
typedef HashMap<StringImpl*, JSString*, IdentifierRepHash> IdentifierStringMap;
- typedef struct {
- int resolveOperations;
- int putOperations;
- } ResolveCacheEntry;
- typedef HashMap<StringImpl*, ResolveCacheEntry, IdentifierRepHash> IdentifierResolvePutMap;
- typedef HashMap<StringImpl*, uint32_t, IdentifierRepHash> IdentifierResolveMap;
// Helper for emitCall() and emitConstruct(). This works because the set of
// expected functions have identical behavior for both call and construct
// (i.e. "Object()" is identical to "new Object()").
ExpectedFunction emitExpectedFunctionSnippet(RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, Label* done);
- RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, unsigned divot, unsigned startOffset, unsigned endOffset, unsigned line, unsigned lineStart);
+ RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, ExpectedFunction, CallArguments&, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
RegisterID* newRegister();
// Adds a var slot and maps it to the name ident in symbolTable().
- RegisterID* addVar(const Identifier& ident, bool isConstant)
+ enum WatchMode { IsWatchable, NotWatchable };
+ RegisterID* addVar(const Identifier& ident, ConstantMode constantMode, WatchMode watchMode)
{
RegisterID* local;
- addVar(ident, isConstant, local);
+ addVar(ident, constantMode, watchMode, local);
return local;
}
// Ditto. Returns true if a new RegisterID was added, false if a pre-existing RegisterID was re-used.
- bool addVar(const Identifier&, bool isConstant, RegisterID*&);
+ bool addVar(const Identifier&, ConstantMode, WatchMode, RegisterID*&);
// Adds an anonymous var slot. To give this slot a name, add it to symbolTable().
RegisterID* addVar()
void addCallee(FunctionBodyNode*, RegisterID*);
void preserveLastVar();
- bool shouldAvoidResolveGlobal();
RegisterID& registerFor(int index)
{
- if (index >= 0)
- return m_calleeRegisters[index];
+ if (operandIsLocal(index))
+ return m_calleeRegisters[VirtualRegister(index).toLocal()];
if (index == JSStack::Callee)
return m_calleeRegister;
ASSERT(m_parameters.size());
- return m_parameters[index + m_parameters.size() + JSStack::CallFrameHeaderSize];
+ return m_parameters[VirtualRegister(index).toArgument()];
}
unsigned addConstant(const Identifier&);
UnlinkedFunctionExecutable* makeFunction(FunctionBodyNode* body)
{
- return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), body);
+ return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), body, isBuiltinFunction() ? UnlinkedBuiltinFunction : UnlinkedNormalFunction);
}
RegisterID* emitInitLazyRegister(RegisterID*);
-
+
+ RegisterID* emitConstructVarargs(RegisterID* dst, RegisterID* func, RegisterID* arguments, RegisterID* firstFreeRegister, int32_t firstVarArgOffset, RegisterID* profileHookRegister, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
+ RegisterID* emitCallVarargs(OpcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, RegisterID* arguments, RegisterID* firstFreeRegister, int32_t firstVarArgOffset, RegisterID* profileHookRegister, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
+
public:
JSString* addStringConstant(const Identifier&);
Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow>& instructions() { return m_instructions; }
- SharedSymbolTable& symbolTable() { return *m_symbolTable; }
+ SymbolTable& symbolTable() { return *m_symbolTable; }
bool shouldOptimizeLocals()
{
- if (m_dynamicScopeDepth)
+ if (m_codeType != FunctionCode)
return false;
- if (m_codeType != FunctionCode)
+ if (m_localScopeDepth)
return false;
return true;
bool canOptimizeNonLocals()
{
- if (m_dynamicScopeDepth)
+ if (m_localScopeDepth)
return false;
if (m_codeType == EvalCode)
return true;
}
+ bool shouldTearOffArgumentsEagerly()
+ {
+ return m_codeType == FunctionCode && isStrictMode() && m_scopeNode->modifiesParameter();
+ }
+
RegisterID* emitThrowExpressionTooDeepException();
void createArgumentsIfNecessary();
void createActivationIfNecessary();
RegisterID* createLazyRegisterIfNecessary(RegisterID*);
+ unsigned watchableVariable(int operand)
+ {
+ VirtualRegister reg(operand);
+ if (!reg.isLocal())
+ return UINT_MAX;
+ if (static_cast<size_t>(reg.toLocal()) >= m_watchableVariables.size())
+ return UINT_MAX;
+ Identifier& ident = m_watchableVariables[reg.toLocal()];
+ if (ident.isNull())
+ return UINT_MAX;
+ return addConstant(ident);
+ }
+
+ bool hasWatchableVariable(int operand)
+ {
+ return watchableVariable(operand) != UINT_MAX;
+ }
+
Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow> m_instructions;
bool m_shouldEmitDebugHooks;
bool m_shouldEmitProfileHooks;
- SharedSymbolTable* m_symbolTable;
+ SymbolTable* m_symbolTable;
ScopeNode* m_scopeNode;
- Strong<JSScope> m_scope;
Strong<UnlinkedCodeBlock> m_codeBlock;
// Some of these objects keep pointers to one another. They are arranged
RegisterID* m_activationRegister;
RegisterID* m_emptyValueRegister;
RegisterID* m_globalObjectRegister;
+ Vector<Identifier, 16> m_watchableVariables;
SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
SegmentedVector<RegisterID, 32> m_calleeRegisters;
SegmentedVector<RegisterID, 32> m_parameters;
LabelScopeStore m_labelScopes;
RefPtr<RegisterID> m_lastVar;
int m_finallyDepth;
- int m_dynamicScopeDepth;
+ int m_localScopeDepth;
CodeType m_codeType;
Vector<ControlFlowContext, 0, UnsafeVectorOverflow> m_scopeContextStack;
Vector<SwitchInfo> m_switchContextStack;
Vector<ForInContext> m_forInContextStack;
Vector<TryContext> m_tryContextStack;
+ Vector<std::pair<RefPtr<RegisterID>, const DeconstructionPatternNode*>> m_deconstructedParameters;
Vector<TryRange> m_tryRanges;
SegmentedVector<TryData, 8> m_tryData;
int m_globalVarStorageOffset;
- bool m_hasCreatedActivation;
int m_firstLazyFunction;
int m_lastLazyFunction;
- HashMap<unsigned int, FunctionBodyNode*, WTF::IntHash<unsigned int>, WTF::UnsignedWithZeroKeyHashTraits<unsigned int> > m_lazyFunctions;
+ HashMap<unsigned int, FunctionBodyNode*, WTF::IntHash<unsigned int>, WTF::UnsignedWithZeroKeyHashTraits<unsigned int>> m_lazyFunctions;
typedef HashMap<FunctionBodyNode*, unsigned> FunctionOffsetMap;
FunctionOffsetMap m_functionOffsets;
NumberMap m_numberMap;
IdentifierStringMap m_stringMap;
- uint32_t getResolveOperations(const Identifier& property)
- {
- if (m_dynamicScopeDepth)
- return m_codeBlock->addResolve();
- IdentifierResolveMap::AddResult result = m_resolveCacheMap.add(property.impl(), 0);
- if (result.isNewEntry)
- result.iterator->value = m_codeBlock->addResolve();
- return result.iterator->value;
- }
-
- uint32_t getResolveWithThisOperations(const Identifier& property)
- {
- if (m_dynamicScopeDepth)
- return m_codeBlock->addResolve();
- IdentifierResolveMap::AddResult result = m_resolveWithThisCacheMap.add(property.impl(), 0);
- if (result.isNewEntry)
- result.iterator->value = m_codeBlock->addResolve();
- return result.iterator->value;
- }
-
- uint32_t getResolveBaseOperations(IdentifierResolvePutMap& map, const Identifier& property, uint32_t& putToBaseOperation)
- {
- if (m_dynamicScopeDepth) {
- putToBaseOperation = m_codeBlock->addPutToBase();
- return m_codeBlock->addResolve();
- }
- ResolveCacheEntry entry = {-1, -1};
- IdentifierResolvePutMap::AddResult result = map.add(property.impl(), entry);
- if (result.isNewEntry)
- result.iterator->value.resolveOperations = m_codeBlock->addResolve();
- if (result.iterator->value.putOperations == -1)
- result.iterator->value.putOperations = getPutToBaseOperation(property);
- putToBaseOperation = result.iterator->value.putOperations;
- return result.iterator->value.resolveOperations;
- }
-
- uint32_t getResolveBaseOperations(const Identifier& property)
- {
- uint32_t scratch;
- return getResolveBaseOperations(m_resolveBaseMap, property, scratch);
- }
-
- uint32_t getResolveBaseForPutOperations(const Identifier& property, uint32_t& putToBaseOperation)
- {
- return getResolveBaseOperations(m_resolveBaseForPutMap, property, putToBaseOperation);
- }
-
- uint32_t getResolveWithBaseForPutOperations(const Identifier& property, uint32_t& putToBaseOperation)
- {
- return getResolveBaseOperations(m_resolveWithBaseForPutMap, property, putToBaseOperation);
- }
-
- uint32_t getPutToBaseOperation(const Identifier& property)
- {
- if (m_dynamicScopeDepth)
- return m_codeBlock->addPutToBase();
- IdentifierResolveMap::AddResult result = m_putToBaseMap.add(property.impl(), 0);
- if (result.isNewEntry)
- result.iterator->value = m_codeBlock->addPutToBase();
- return result.iterator->value;
- }
-
- IdentifierResolveMap m_putToBaseMap;
- IdentifierResolveMap m_resolveCacheMap;
- IdentifierResolveMap m_resolveWithThisCacheMap;
- IdentifierResolvePutMap m_resolveBaseMap;
- IdentifierResolvePutMap m_resolveBaseForPutMap;
- IdentifierResolvePutMap m_resolveWithBaseForPutMap;
-
StaticPropertyAnalyzer m_staticPropertyAnalyzer;
VM* m_vm;
size_t m_lastOpcodePosition;
#endif
- StackBounds m_stack;
-
bool m_usesExceptions;
bool m_expressionTooDeep;
+ bool m_isBuiltinFunction;
};
}
projects / apple / javascriptcore.git / blobdiff