runtime/vm/intermediate_language.h - Issue 10875058: Require ResultCid specification in every computation, that way we can differentiate between computa…

Unified Diff: runtime/vm/intermediate_language.h

Issue 10875058: Require ResultCid specification in every computation, that way we can differentiate between computa… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/intermediate_language.h

===================================================================

--- runtime/vm/intermediate_language.h (revision 11330)

+++ runtime/vm/intermediate_language.h (working copy)

@@ -189,7 +189,7 @@

// Compile time type of the computation, which typically depends on the

// compile time types (and possibly propagated types) of its inputs.

virtual RawAbstractType* CompileType() const = 0;

- virtual intptr_t ResultCid() const { return kDynamicCid; }

+ virtual intptr_t ResultCid() const = 0;

// Mutate assigned_vars to add the local variable index for all

// frame-allocated locals assigned to by the computation.

@@ -556,6 +556,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -617,6 +618,7 @@

DECLARE_COMPUTATION(CurrentContext)

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

DISALLOW_COPY_AND_ASSIGN(CurrentContextComp);

@@ -635,6 +637,7 @@

Value* value() const { return inputs_[0]; }

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

private:

DISALLOW_COPY_AND_ASSIGN(StoreContextComp);

@@ -664,6 +667,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const ClosureCallNode& ast_node_;

@@ -717,6 +721,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -750,6 +755,7 @@

DECLARE_CALL_COMPUTATION(PolymorphicInstanceCall)

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

InstanceCallComp* instance_call_;

@@ -916,6 +922,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -943,6 +950,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const LocalVariable& local_;

@@ -975,6 +983,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const LocalVariable& local_;

@@ -1015,6 +1024,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const NativeBodyNode& ast_node_;

@@ -1044,6 +1054,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return original_ != NULL; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const Field& field_;

@@ -1079,6 +1090,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return original_ != NULL; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const Field& field_;

@@ -1099,6 +1111,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const Field& field_;

@@ -1124,6 +1137,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const Field& field_;

@@ -1156,6 +1170,7 @@

InstanceCallComp* original() const { return original_; }

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

intptr_t receiver_type_;

@@ -1193,6 +1208,7 @@

intptr_t receiver_type() const { return receiver_type_; }

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

intptr_t receiver_type_;

@@ -1215,6 +1231,7 @@

Value* value() const { return inputs_[0]; }

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kBoolCid; }

private:

DISALLOW_COPY_AND_ASSIGN(BooleanNegateComp);

@@ -1296,6 +1313,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const ConstructorCallNode& ast_node_;

@@ -1328,6 +1346,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const ConstructorCallNode& ast_node_;

@@ -1373,6 +1392,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -1407,6 +1427,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const ClosureNode& ast_node_;

@@ -1480,6 +1501,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t offset_in_bytes_;

@@ -1515,6 +1537,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -1551,6 +1574,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -1580,6 +1604,7 @@

intptr_t token_pos() const { return ast_node_.token_pos(); }

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const ConstructorCallNode& ast_node_;

@@ -1606,6 +1631,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

private:

const intptr_t token_pos_;

@@ -1628,6 +1654,7 @@

Value* context_value() const { return inputs_[0]; }

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

private:

DISALLOW_COPY_AND_ASSIGN(ChainContextComp);

@@ -1652,6 +1679,7 @@

DECLARE_COMPUTATION(CloneContext)

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

private:

const intptr_t token_pos_;

@@ -1675,6 +1703,7 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

private:

const LocalVariable& exception_var_;

@@ -1699,6 +1728,7 @@

DECLARE_COMPUTATION(CheckEitherNonSmi)

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

virtual bool HasSideEffect() const { return false; }

@@ -1753,6 +1783,8 @@

virtual bool CanDeoptimize() const {

return value()->ResultCid() != kDoubleCid;

}

+ // The output is not an instance.

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

virtual Representation representation() const {

return kUnboxedDouble;

@@ -1787,6 +1819,8 @@

virtual void PrintOperandsTo(BufferFormatter* f) const;

virtual bool CanDeoptimize() const { return false; }

+ // The output is not an instance.

+ virtual intptr_t ResultCid() const { return kDynamicCid; }

virtual Representation representation() const {

return kUnboxedDouble;

@@ -1947,6 +1981,7 @@

DECLARE_COMPUTATION(NumberNegate)

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kDoubleCid; }

private:

InstanceCallComp* instance_call_;

@@ -1967,6 +2002,7 @@

DECLARE_COMPUTATION(CheckStackOverflow)

virtual bool CanDeoptimize() const { return false; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

private:

const intptr_t token_pos_;

@@ -2032,6 +2068,7 @@

DECLARE_COMPUTATION(CheckClass)

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

virtual bool AttributesEqual(Computation* other) const;

@@ -2062,6 +2099,7 @@

DECLARE_COMPUTATION(CheckSmi)

virtual bool CanDeoptimize() const { return true; }

+ virtual intptr_t ResultCid() const { return kIllegalCid; }

virtual bool AttributesEqual(Computation* other) const { return true; }

« runtime/vm/flow_graph_optimizer.cc ('K') | « runtime/vm/flow_graph_optimizer.cc ('k') | no next file » | no next file with comments »