From 12d8a90b3e1b2c19afbdf8cb06c2557724f74361 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 6 Mar 2013 12:49:24 +0400 Subject: [PATCH] invoke equalsOrContainsAsArgument instead of dependsOnTypeConstructors --- .../jet/lang/resolve/calls/inference/ConstraintSystemImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java index a2724edcd45..bbd0c1360f3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java @@ -68,8 +68,7 @@ public class ConstraintSystemImpl implements ConstraintSystem { TypeParameterDescriptor descriptor = (TypeParameterDescriptor) declarationDescriptor; JetType value = ConstraintsUtil.getValue(getTypeConstraints(descriptor)); - if (value != null && !TypeUtils.dependsOnTypeConstructors(value, Collections.singleton( - DONT_CARE.getConstructor()))) { + if (value != null && !TypeUtils.equalsOrContainsAsArgument(value, DONT_CARE)) { return new TypeProjection(value); } if (typeParameterConstraints.containsKey(descriptor)) {