diff options
Diffstat (limited to 'deps/v8/src/compiler/serializer-for-background-compilation.h')
| -rw-r--r-- | deps/v8/src/compiler/serializer-for-background-compilation.h | 173 |
1 files changed, 127 insertions, 46 deletions
diff --git a/deps/v8/src/compiler/serializer-for-background-compilation.h b/deps/v8/src/compiler/serializer-for-background-compilation.h index 76bc675e66..b6c9bfa125 100644 --- a/deps/v8/src/compiler/serializer-for-background-compilation.h +++ b/deps/v8/src/compiler/serializer-for-background-compilation.h @@ -5,7 +5,10 @@ #ifndef V8_COMPILER_SERIALIZER_FOR_BACKGROUND_COMPILATION_H_ #define V8_COMPILER_SERIALIZER_FOR_BACKGROUND_COMPILATION_H_ +#include "src/base/optional.h" #include "src/handles.h" +#include "src/maybe-handles.h" +#include "src/utils.h" #include "src/zone/zone-containers.h" namespace v8 { @@ -33,37 +36,18 @@ namespace compiler { V(CreateBlockContext) \ V(CreateFunctionContext) \ V(CreateEvalContext) \ - V(Jump) \ - V(JumpConstant) \ - V(JumpIfFalse) \ - V(JumpIfFalseConstant) \ - V(JumpIfJSReceiver) \ - V(JumpIfJSReceiverConstant) \ - V(JumpIfNotNull) \ - V(JumpIfNotNullConstant) \ - V(JumpIfNotUndefined) \ - V(JumpIfNotUndefinedConstant) \ - V(JumpIfNull) \ - V(JumpIfNullConstant) \ - V(JumpIfToBooleanTrueConstant) \ - V(JumpIfToBooleanFalseConstant) \ - V(JumpIfToBooleanTrue) \ - V(JumpIfToBooleanFalse) \ - V(JumpIfTrue) \ - V(JumpIfTrueConstant) \ - V(JumpIfUndefined) \ - V(JumpIfUndefinedConstant) \ - V(JumpLoop) \ + V(Debugger) \ V(PushContext) \ V(PopContext) \ + V(ResumeGenerator) \ V(ReThrow) \ V(StaContextSlot) \ V(StaCurrentContextSlot) \ + V(SuspendGenerator) \ + V(SwitchOnGeneratorState) \ V(Throw) #define CLEAR_ACCUMULATOR_LIST(V) \ - V(CallWithSpread) \ - V(ConstructWithSpread) \ V(CreateEmptyObjectLiteral) \ V(CreateMappedArguments) \ V(CreateRestParameter) \ @@ -74,10 +58,52 @@ namespace compiler { V(LdaGlobalInsideTypeof) \ V(LdaImmutableContextSlot) \ V(LdaImmutableCurrentContextSlot) \ - V(LdaKeyedProperty) \ V(LdaNamedProperty) \ V(LdaNamedPropertyNoFeedback) +#define UNCONDITIONAL_JUMPS_LIST(V) \ + V(Jump) \ + V(JumpConstant) \ + V(JumpLoop) + +#define CONDITIONAL_JUMPS_LIST(V) \ + V(JumpIfFalse) \ + V(JumpIfFalseConstant) \ + V(JumpIfJSReceiver) \ + V(JumpIfJSReceiverConstant) \ + V(JumpIfNotNull) \ + V(JumpIfNotNullConstant) \ + V(JumpIfNotUndefined) \ + V(JumpIfNotUndefinedConstant) \ + V(JumpIfNull) \ + V(JumpIfNullConstant) \ + V(JumpIfToBooleanTrueConstant) \ + V(JumpIfToBooleanFalseConstant) \ + V(JumpIfToBooleanTrue) \ + V(JumpIfToBooleanFalse) \ + V(JumpIfTrue) \ + V(JumpIfTrueConstant) \ + V(JumpIfUndefined) \ + V(JumpIfUndefinedConstant) + +#define INGORED_BYTECODE_LIST(V) \ + V(TestEqual) \ + V(TestEqualStrict) \ + V(TestLessThan) \ + V(TestGreaterThan) \ + V(TestLessThanOrEqual) \ + V(TestGreaterThanOrEqual) \ + V(TestReferenceEqual) \ + V(TestInstanceOf) \ + V(TestIn) \ + V(TestUndetectable) \ + V(TestNull) \ + V(TestUndefined) \ + V(TestTypeOf) \ + V(ThrowReferenceErrorIfHole) \ + V(ThrowSuperNotCalledIfHole) \ + V(ThrowSuperAlreadyCalledIfNotHole) + #define SUPPORTED_BYTECODE_LIST(V) \ V(CallAnyReceiver) \ V(CallNoFeedback) \ @@ -89,11 +115,14 @@ namespace compiler { V(CallUndefinedReceiver0) \ V(CallUndefinedReceiver1) \ V(CallUndefinedReceiver2) \ + V(CallWithSpread) \ V(Construct) \ + V(ConstructWithSpread) \ V(CreateClosure) \ V(ExtraWide) \ V(Illegal) \ V(LdaConstant) \ + V(LdaKeyedProperty) \ V(LdaNull) \ V(Ldar) \ V(LdaSmi) \ @@ -101,25 +130,65 @@ namespace compiler { V(LdaZero) \ V(Mov) \ V(Return) \ + V(StackCheck) \ + V(StaInArrayLiteral) \ + V(StaKeyedProperty) \ V(Star) \ V(Wide) \ CLEAR_ENVIRONMENT_LIST(V) \ - CLEAR_ACCUMULATOR_LIST(V) + CLEAR_ACCUMULATOR_LIST(V) \ + CONDITIONAL_JUMPS_LIST(V) \ + UNCONDITIONAL_JUMPS_LIST(V) \ + INGORED_BYTECODE_LIST(V) class JSHeapBroker; +template <typename T> +struct HandleComparator { + bool operator()(const Handle<T>& lhs, const Handle<T>& rhs) const { + return lhs.address() < rhs.address(); + } +}; + struct FunctionBlueprint { Handle<SharedFunctionInfo> shared; - Handle<FeedbackVector> feedback; + Handle<FeedbackVector> feedback_vector; + + bool operator<(const FunctionBlueprint& other) const { + // A feedback vector is never used for more than one SFI, so it can + // be used for strict ordering of blueprints. + DCHECK_IMPLIES(feedback_vector.equals(other.feedback_vector), + shared.equals(other.shared)); + return HandleComparator<FeedbackVector>()(feedback_vector, + other.feedback_vector); + } +}; + +class CompilationSubject { + public: + explicit CompilationSubject(FunctionBlueprint blueprint) + : blueprint_(blueprint) {} + CompilationSubject(Handle<JSFunction> closure, Isolate* isolate); + + FunctionBlueprint blueprint() const { return blueprint_; } + MaybeHandle<JSFunction> closure() const { return closure_; } + + private: + FunctionBlueprint blueprint_; + MaybeHandle<JSFunction> closure_; }; +typedef ZoneSet<Handle<Object>, HandleComparator<Object>> ConstantsSet; +typedef ZoneSet<Handle<Map>, HandleComparator<Map>> MapsSet; +typedef ZoneSet<FunctionBlueprint> BlueprintsSet; + class Hints { public: explicit Hints(Zone* zone); - const ZoneVector<Handle<Object>>& constants() const; - const ZoneVector<Handle<Map>>& maps() const; - const ZoneVector<FunctionBlueprint>& function_blueprints() const; + const ConstantsSet& constants() const; + const MapsSet& maps() const; + const BlueprintsSet& function_blueprints() const; void AddConstant(Handle<Object> constant); void AddMap(Handle<Map> map); @@ -128,11 +197,12 @@ class Hints { void Add(const Hints& other); void Clear(); + bool IsEmpty() const; private: - ZoneVector<Handle<Object>> constants_; - ZoneVector<Handle<Map>> maps_; - ZoneVector<FunctionBlueprint> function_blueprints_; + ConstantsSet constants_; + MapsSet maps_; + BlueprintsSet function_blueprints_; }; typedef ZoneVector<Hints> HintsVector; @@ -143,12 +213,15 @@ typedef ZoneVector<Hints> HintsVector; class SerializerForBackgroundCompilation { public: SerializerForBackgroundCompilation(JSHeapBroker* broker, Zone* zone, - Handle<JSFunction> function); + Handle<JSFunction> closure); Hints Run(); // NOTE: Returns empty for an already-serialized function. + class Environment; + private: SerializerForBackgroundCompilation(JSHeapBroker* broker, Zone* zone, - FunctionBlueprint function, + CompilationSubject function, + base::Optional<Hints> new_target, const HintsVector& arguments); void TraverseBytecode(); @@ -158,22 +231,30 @@ class SerializerForBackgroundCompilation { SUPPORTED_BYTECODE_LIST(DECLARE_VISIT_BYTECODE) #undef DECLARE_VISIT_BYTECODE - class Environment; + void ProcessCallOrConstruct(Hints callee, base::Optional<Hints> new_target, + const HintsVector& arguments, FeedbackSlot slot, + bool with_spread = false); + void ProcessCallVarArgs(interpreter::BytecodeArrayIterator* iterator, + ConvertReceiverMode receiver_mode, + bool with_spread = false); + void ProcessJump(interpreter::BytecodeArrayIterator* iterator); + void MergeAfterJump(interpreter::BytecodeArrayIterator* iterator); + + Hints RunChildSerializer(CompilationSubject function, + base::Optional<Hints> new_target, + const HintsVector& arguments, bool with_spread); + + void ProcessFeedbackForKeyedPropertyAccess( + interpreter::BytecodeArrayIterator* iterator); - Zone* zone() const { return zone_; } JSHeapBroker* broker() const { return broker_; } + Zone* zone() const { return zone_; } Environment* environment() const { return environment_; } - void ProcessCallOrConstruct(const Hints& callee, - const HintsVector& arguments); - void ProcessCallVarArgs(interpreter::BytecodeArrayIterator* iterator, - ConvertReceiverMode receiver_mode); - - JSHeapBroker* broker_; - Zone* zone_; - Handle<SharedFunctionInfo> shared_; - Handle<FeedbackVector> feedback_; - Environment* environment_; + JSHeapBroker* const broker_; + Zone* const zone_; + Environment* const environment_; + ZoneUnorderedMap<int, Environment*> stashed_environments_; }; } // namespace compiler |