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

Unified Diff: sdk/lib/_internal/compiler/implementation/ssa/types.dart

Issue 12431007: Revert "Implement subclass union and intersection on type mask." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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 | sdk/lib/_internal/compiler/implementation/types/type_mask.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/ssa/types.dart
diff --git a/sdk/lib/_internal/compiler/implementation/ssa/types.dart b/sdk/lib/_internal/compiler/implementation/ssa/types.dart
index ec73cb0e10ab4a4bad03bc0ae7b11b1401012ee6..578654db78e7211bcb24c70ffdca2d30edc0b258 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/types.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/types.dart
@@ -978,7 +978,7 @@ class HBoundedType extends HType {
TypeMask otherMask = other.computeMask(compiler);
if (otherMask != null) {
- TypeMask intersection = mask.intersection(otherMask, compiler);
+ TypeMask intersection = mask.intersection(otherMask, compiler.types);
if (intersection != null) {
if (intersection == mask) return this;
return new HType.fromMask(intersection, compiler);
@@ -1002,7 +1002,7 @@ class HBoundedType extends HType {
TypeMask otherMask = other.computeMask(compiler);
if (otherMask != null) {
- TypeMask union = mask.union(otherMask, compiler);
+ TypeMask union = mask.union(otherMask, compiler.types);
if (union == null) return HType.UNKNOWN;
if (union == mask) return this;
return new HType.fromMask(union, compiler);
« no previous file with comments | « no previous file | sdk/lib/_internal/compiler/implementation/types/type_mask.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698