From 1854279d75e40bce42b02471e6fbf6afdb9b8d1b Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 5 Feb 2024 19:44:12 +0100 Subject: [PATCH] JPS mappings for incremental compilation refactoring: simplify resulting constraint if ANY_CONSTRAINT is used GitOrigin-RevId: 356e570b090f6e22a081600acf8bf11a176e674c --- .../jetbrains/jps/dependency/impl/DependencyGraphImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/dependency/impl/DependencyGraphImpl.java b/jps/jps-builders/src/org/jetbrains/jps/dependency/impl/DependencyGraphImpl.java index a0d1fbbb350b..cfb3b9c38e50 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/dependency/impl/DependencyGraphImpl.java +++ b/jps/jps-builders/src/org/jetbrains/jps/dependency/impl/DependencyGraphImpl.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.jps.dependency.impl; import org.jetbrains.annotations.NotNull; @@ -114,7 +114,7 @@ public final class DependencyGraphImpl extends GraphImpl implements DependencyGr @Override public void affectUsage(@NotNull Usage usage, @NotNull Predicate> constraint) { Predicate> prevConstraint = affectedUsages.put(usage, constraint); - if (prevConstraint != null) { + if (prevConstraint != null && constraint != ANY_CONSTRAINT) { affectedUsages.put(usage, prevConstraint == ANY_CONSTRAINT? ANY_CONSTRAINT : prevConstraint.or(constraint)); } }