| commit | 4dc3a043f1c0f3d0bc5d019bb9e1345ba3f2a190 | [log] [tgz] |
|---|---|---|
| author | ricow@google.com <ricow@google.com> | Mon May 19 05:33:22 2014 +0000 |
| committer | ricow@google.com <ricow@google.com> | Wed May 27 13:32:52 2015 -0700 |
| tree | 783ce846afddb661182322559694d8c3f2da3b24 | |
| parent | 1bef799c94fdc49a0d9b778ab59dfa405a5d8a1f [diff] |
Version 1.4.0-dev.6.8 svn merge -c 36234 https://dart.googlecode.com/svn/branches/bleeding_edge trunk Merge revision 35970 by applying: https://codereview.chromium.org/283373002 Merge revision 36200 by applying: https://codereview.chromium.org/284123007/ git-svn-id: http://dart.googlecode.com/svn/trunk@36284 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart index bf495e4..37eec18 100644 --- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart +++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -3768,7 +3768,7 @@ const Link<TypeVariableElement>(); seenTypeVariables = seenTypeVariables.prepend(variableElement); DartType bound = boundType; - while (bound.element.isTypeVariable()) { + while (bound.kind == TypeKind.TYPE_VARIABLE) { TypeVariableElement element = bound.element; if (seenTypeVariables.contains(element)) { if (identical(element, variableElement)) {
diff --git a/tools/VERSION b/tools/VERSION index 5cf5da2..67d04a5 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -28,4 +28,4 @@ MINOR 4 PATCH 0 PRERELEASE 6 -PRERELEASE_PATCH 7 +PRERELEASE_PATCH 8