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

Side by Side Diff: runtime/vm/object.cc

Issue 18627003: FIx HasTypeArguments test. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 5 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 #include "vm/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/cpu.h" 10 #include "vm/cpu.h"
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1673 break; 1673 break;
1674 } 1674 }
1675 sup_type ^= cls.super_type(); 1675 sup_type ^= cls.super_type();
1676 cls = sup_type.type_class(); 1676 cls = sup_type.type_class();
1677 } while (true); 1677 } while (true);
1678 return num_type_args; 1678 return num_type_args;
1679 } 1679 }
1680 1680
1681 1681
1682 bool Class::HasTypeArguments() const { 1682 bool Class::HasTypeArguments() const {
1683 if (!IsSignatureClass() && (is_type_finalized() || is_prefinalized())) { 1683 if (!IsSignatureClass() && (is_finalized() || is_prefinalized())) {
1684 // More efficient than calling NumTypeArguments(). 1684 // More efficient than calling NumTypeArguments().
1685 return type_arguments_field_offset() != kNoTypeArguments; 1685 return type_arguments_field_offset() != kNoTypeArguments;
1686 } else { 1686 } else {
1687 // No need to check NumTypeArguments() if class has type parameters. 1687 // No need to check NumTypeArguments() if class has type parameters.
1688 return (NumTypeParameters() > 0) || (NumTypeArguments() > 0); 1688 return (NumTypeParameters() > 0) || (NumTypeArguments() > 0);
1689 } 1689 }
1690 } 1690 }
1691 1691
1692 1692
1693 RawClass* Class::SuperClass() const { 1693 RawClass* Class::SuperClass() const {
(...skipping 12342 matching lines...) Expand 10 before | Expand all | Expand 10 after
14036 } 14036 }
14037 14037
14038 14038
14039 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const { 14039 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
14040 stream->OpenObject(); 14040 stream->OpenObject();
14041 stream->CloseObject(); 14041 stream->CloseObject();
14042 } 14042 }
14043 14043
14044 14044
14045 } // namespace dart 14045 } // namespace dart
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