| Index: src/code-stubs.h
|
| diff --git a/src/code-stubs.h b/src/code-stubs.h
|
| index 726533c705e480e8c74ee8b62b80c45641a88bf2..64c89b93d13d2a4f0621cd0c084d7bea757776a8 100644
|
| --- a/src/code-stubs.h
|
| +++ b/src/code-stubs.h
|
| @@ -168,10 +168,6 @@ class CodeStub BASE_EMBEDDED {
|
| virtual Major MajorKey() = 0;
|
| virtual int MinorKey() = 0;
|
|
|
| - // The CallFunctionStub needs to override this so it can encode whether a
|
| - // lazily generated function should be fully optimized or not.
|
| - virtual InLoopFlag InLoop() { return NOT_IN_LOOP; }
|
| -
|
| // BinaryOpStub needs to override this.
|
| virtual int GetCodeKind();
|
|
|
| @@ -646,8 +642,8 @@ class RegExpConstructResultStub: public CodeStub {
|
|
|
| class CallFunctionStub: public CodeStub {
|
| public:
|
| - CallFunctionStub(int argc, InLoopFlag in_loop, CallFunctionFlags flags)
|
| - : argc_(argc), in_loop_(in_loop), flags_(flags) { }
|
| + CallFunctionStub(int argc, CallFunctionFlags flags)
|
| + : argc_(argc), flags_(flags) { }
|
|
|
| void Generate(MacroAssembler* masm);
|
|
|
| @@ -657,26 +653,20 @@ class CallFunctionStub: public CodeStub {
|
|
|
| private:
|
| int argc_;
|
| - InLoopFlag in_loop_;
|
| CallFunctionFlags flags_;
|
|
|
| virtual void PrintName(StringStream* stream);
|
|
|
| // Minor key encoding in 32 bits with Bitfield <Type, shift, size>.
|
| - class InLoopBits: public BitField<InLoopFlag, 0, 1> {};
|
| - class FlagBits: public BitField<CallFunctionFlags, 1, 1> {};
|
| - class ArgcBits: public BitField<int, 2, 32 - 2> {};
|
| + class FlagBits: public BitField<CallFunctionFlags, 0, 1> {};
|
| + class ArgcBits: public BitField<unsigned, 1, 32 - 1> {};
|
|
|
| Major MajorKey() { return CallFunction; }
|
| int MinorKey() {
|
| // Encode the parameters in a unique 32 bit value.
|
| - return InLoopBits::encode(in_loop_)
|
| - | FlagBits::encode(flags_)
|
| - | ArgcBits::encode(argc_);
|
| + return FlagBits::encode(flags_) | ArgcBits::encode(argc_);
|
| }
|
|
|
| - InLoopFlag InLoop() { return in_loop_; }
|
| -
|
| bool ReceiverMightBeImplicit() {
|
| return (flags_ & RECEIVER_MIGHT_BE_IMPLICIT) != 0;
|
| }
|
|
|