Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(867)

Side by Side Diff: runtime/vm/intermediate_language.h

Issue 10907256: Fix typo introduced by wrong conflict merge. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #ifndef VM_INTERMEDIATE_LANGUAGE_H_ 5 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
6 #define VM_INTERMEDIATE_LANGUAGE_H_ 6 #define VM_INTERMEDIATE_LANGUAGE_H_
7 7
8 #include "vm/allocation.h" 8 #include "vm/allocation.h"
9 #include "vm/ast.h" 9 #include "vm/ast.h"
10 #include "vm/growable_array.h" 10 #include "vm/growable_array.h"
(...skipping 3135 matching lines...) Expand 10 before | Expand all | Expand 10 after
3146 3146
3147 virtual void PrintOperandsTo(BufferFormatter* f) const; 3147 virtual void PrintOperandsTo(BufferFormatter* f) const;
3148 3148
3149 DECLARE_INSTRUCTION(BinarySmiOp) 3149 DECLARE_INSTRUCTION(BinarySmiOp)
3150 virtual RawAbstractType* CompileType() const; 3150 virtual RawAbstractType* CompileType() const;
3151 3151
3152 virtual bool CanDeoptimize() const; 3152 virtual bool CanDeoptimize() const;
3153 3153
3154 virtual bool HasSideEffect() const { return false; } 3154 virtual bool HasSideEffect() const { return false; }
3155 3155
3156 virtual bool AffectedByEffect() const { return false; } 3156 virtual bool AffectedBySideEffect() const { return false; }
3157 virtual bool AttributesEqual(Definition* other) const; 3157 virtual bool AttributesEqual(Definition* other) const;
3158 3158
3159 virtual intptr_t ResultCid() const; 3159 virtual intptr_t ResultCid() const;
3160 3160
3161 private: 3161 private:
3162 const Token::Kind op_kind_; 3162 const Token::Kind op_kind_;
3163 InstanceCallInstr* instance_call_; 3163 InstanceCallInstr* instance_call_;
3164 3164
3165 DISALLOW_COPY_AND_ASSIGN(BinarySmiOpInstr); 3165 DISALLOW_COPY_AND_ASSIGN(BinarySmiOpInstr);
3166 }; 3166 };
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
3641 ForwardInstructionIterator* current_iterator_; 3641 ForwardInstructionIterator* current_iterator_;
3642 3642
3643 private: 3643 private:
3644 DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor); 3644 DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
3645 }; 3645 };
3646 3646
3647 3647
3648 } // namespace dart 3648 } // namespace dart
3649 3649
3650 #endif // VM_INTERMEDIATE_LANGUAGE_H_ 3650 #endif // VM_INTERMEDIATE_LANGUAGE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698