| OLD | NEW |
| 1 // Copyright 2013 the V8 project authors. All rights reserved. | 1 // Copyright 2013 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 | 27 |
| 28 #ifndef V8_TYPING_H_ | 28 #ifndef V8_TYPING_H_ |
| 29 #define V8_TYPING_H_ | 29 #define V8_TYPING_H_ |
| 30 | 30 |
| 31 #include "v8.h" | 31 #include "v8.h" |
| 32 | 32 |
| 33 #include "allocation.h" | 33 #include "allocation.h" |
| 34 #include "ast.h" | 34 #include "ast.h" |
| 35 #include "compiler.h" | 35 #include "compiler.h" |
| 36 #include "type-info.h" | 36 #include "type-info.h" |
| 37 #include "types.h" |
| 37 #include "zone.h" | 38 #include "zone.h" |
| 38 #include "scopes.h" | 39 #include "scopes.h" |
| 39 | 40 |
| 40 namespace v8 { | 41 namespace v8 { |
| 41 namespace internal { | 42 namespace internal { |
| 42 | 43 |
| 43 | 44 |
| 44 class AstTyper: public AstVisitor { | 45 class AstTyper: public AstVisitor { |
| 45 public: | 46 public: |
| 46 static void Run(CompilationInfo* info); | 47 static void Run(CompilationInfo* info); |
| 47 | 48 |
| 48 void* operator new(size_t size, Zone* zone) { | 49 void* operator new(size_t size, Zone* zone) { |
| 49 return zone->New(static_cast<int>(size)); | 50 return zone->New(static_cast<int>(size)); |
| 50 } | 51 } |
| 51 void operator delete(void* pointer, Zone* zone) { } | 52 void operator delete(void* pointer, Zone* zone) { } |
| 52 void operator delete(void* pointer) { } | 53 void operator delete(void* pointer) { } |
| 53 | 54 |
| 54 DEFINE_AST_VISITOR_SUBCLASS_MEMBERS(); | 55 DEFINE_AST_VISITOR_SUBCLASS_MEMBERS(); |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 explicit AstTyper(CompilationInfo* info); | 58 explicit AstTyper(CompilationInfo* info); |
| 58 | 59 |
| 59 CompilationInfo* info_; | 60 CompilationInfo* info_; |
| 60 TypeFeedbackOracle oracle_; | 61 TypeFeedbackOracle oracle_; |
| 61 | 62 |
| 62 TypeFeedbackOracle* oracle() { return &oracle_; } | 63 TypeFeedbackOracle* oracle() { return &oracle_; } |
| 63 Zone* zone() const { return info_->zone(); } | 64 Zone* zone() const { return info_->zone(); } |
| 64 | 65 |
| 65 void MergeLowerType(Expression* e, Handle<Type> t) { | 66 void NarrowType(Expression* e, Bounds b) { |
| 66 e->set_lower_type(handle(Type::Union(e->lower_type(), t), isolate_)); | 67 e->set_bounds(Bounds::Both(e->bounds(), b, isolate_)); |
| 67 } | 68 } |
| 68 void MergeUpperType(Expression* e, Handle<Type> t) { | 69 void NarrowLowerType(Expression* e, Handle<Type> t) { |
| 69 e->set_upper_type(handle(Type::Intersect(e->upper_type(), t), isolate_)); | 70 e->set_bounds(Bounds::NarrowLower(e->bounds(), t, isolate_)); |
| 70 } | |
| 71 void MergeLowerType(Expression* e, Type* t) { | |
| 72 MergeLowerType(e, handle(t, isolate_)); | |
| 73 } | |
| 74 void MergeUpperType(Expression* e, Type* t) { | |
| 75 MergeUpperType(e, handle(t, isolate_)); | |
| 76 } | 71 } |
| 77 | 72 |
| 78 void VisitDeclarations(ZoneList<Declaration*>* declarations); | 73 void VisitDeclarations(ZoneList<Declaration*>* declarations); |
| 79 void VisitStatements(ZoneList<Statement*>* statements); | 74 void VisitStatements(ZoneList<Statement*>* statements); |
| 80 | 75 |
| 81 #define DECLARE_VISIT(type) virtual void Visit##type(type* node); | 76 #define DECLARE_VISIT(type) virtual void Visit##type(type* node); |
| 82 AST_NODE_LIST(DECLARE_VISIT) | 77 AST_NODE_LIST(DECLARE_VISIT) |
| 83 #undef DECLARE_VISIT | 78 #undef DECLARE_VISIT |
| 84 | 79 |
| 85 DISALLOW_COPY_AND_ASSIGN(AstTyper); | 80 DISALLOW_COPY_AND_ASSIGN(AstTyper); |
| 86 }; | 81 }; |
| 87 | 82 |
| 88 } } // namespace v8::internal | 83 } } // namespace v8::internal |
| 89 | 84 |
| 90 #endif // V8_TYPING_H_ | 85 #endif // V8_TYPING_H_ |
| OLD | NEW |