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

Unified Diff: runtime/vm/object.cc

Issue 8341007: Temporary workaround for issue 5474672. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 9 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 503)
+++ runtime/vm/object.cc (working copy)
@@ -1770,8 +1770,11 @@
ASSERT(other.IsFinalized());
// Type parameters cannot be handled by Class::IsMoreSpecificThan().
if (IsTypeParameter() || other.IsTypeParameter()) {
- return IsTypeParameter() && other.IsTypeParameter() &&
- (Index() == other.Index());
+ // TODO(regis): Revisit this temporary workaround. See issue 5474672.
+ return
+ (!IsTypeParameter() && other.IsTypeParameter()) ||
+ (IsTypeParameter() && other.IsTypeParameter() &&
+ (Index() == other.Index()));
}
const Class& cls = Class::Handle(type_class());
return cls.IsMoreSpecificThan(TypeArguments::Handle(arguments()),
@@ -1785,8 +1788,11 @@
ASSERT(other.IsFinalized());
// Type parameters cannot be handled by Class::TestType().
if (IsTypeParameter() || other.IsTypeParameter()) {
- return IsTypeParameter() && other.IsTypeParameter() &&
- (Index() == other.Index());
+ // TODO(regis): Revisit this temporary workaround. See issue 5474672.
+ return
+ (!IsTypeParameter() && other.IsTypeParameter()) ||
+ (IsTypeParameter() && other.IsTypeParameter() &&
+ (Index() == other.Index()));
}
const Class& cls = Class::Handle(type_class());
if (test == kIsSubtypeOf) {
« 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