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

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

Issue 2140223002: Add missing trail argument when comparing cyclic type graphs (bug uncovered by hot reload). (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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
« 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/become.h" 10 #include "vm/become.h"
(...skipping 16711 matching lines...) Expand 10 before | Expand all | Expand 10 after
16722 if (!other_type_args.IsRaw(0, num_type_args)) { 16722 if (!other_type_args.IsRaw(0, num_type_args)) {
16723 return false; 16723 return false;
16724 } 16724 }
16725 } else if (other_type_args.IsNull()) { 16725 } else if (other_type_args.IsNull()) {
16726 // Ignore from_index. 16726 // Ignore from_index.
16727 if (!type_args.IsRaw(0, num_type_args)) { 16727 if (!type_args.IsRaw(0, num_type_args)) {
16728 return false; 16728 return false;
16729 } 16729 }
16730 } else if (!type_args.IsSubvectorEquivalent(other_type_args, 16730 } else if (!type_args.IsSubvectorEquivalent(other_type_args,
16731 from_index, 16731 from_index,
16732 num_type_params)) { 16732 num_type_params,
16733 trail)) {
16733 return false; 16734 return false;
16734 } 16735 }
16735 #ifdef DEBUG 16736 #ifdef DEBUG
16736 if (from_index > 0) { 16737 if (from_index > 0) {
16737 // Verify that the type arguments of the super class match, since they 16738 // Verify that the type arguments of the super class match, since they
16738 // depend solely on the type parameters that were just verified to 16739 // depend solely on the type parameters that were just verified to
16739 // match. 16740 // match.
16740 ASSERT(type_args.Length() >= (from_index + num_type_params)); 16741 ASSERT(type_args.Length() >= (from_index + num_type_params));
16741 ASSERT(other_type_args.Length() >= (from_index + num_type_params)); 16742 ASSERT(other_type_args.Length() >= (from_index + num_type_params));
16742 AbstractType& type_arg = AbstractType::Handle(zone); 16743 AbstractType& type_arg = AbstractType::Handle(zone);
(...skipping 5841 matching lines...) Expand 10 before | Expand all | Expand 10 after
22584 return UserTag::null(); 22585 return UserTag::null();
22585 } 22586 }
22586 22587
22587 22588
22588 const char* UserTag::ToCString() const { 22589 const char* UserTag::ToCString() const {
22589 const String& tag_label = String::Handle(label()); 22590 const String& tag_label = String::Handle(label());
22590 return tag_label.ToCString(); 22591 return tag_label.ToCString();
22591 } 22592 }
22592 22593
22593 } // namespace dart 22594 } // 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