Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DE5EDC9E for ; Fri, 28 Sep 2012 14:57:30 +0000 (UTC) Received: (qmail 20492 invoked by uid 500); 28 Sep 2012 14:57:29 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 20431 invoked by uid 500); 28 Sep 2012 14:57:29 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 20424 invoked by uid 99); 28 Sep 2012 14:57:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 14:57:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 14:57:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 90E0B23889BB for ; Fri, 28 Sep 2012 14:56:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391491 - /commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java Date: Fri, 28 Sep 2012 14:56:45 -0000 To: commits@commons.apache.org From: luc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120928145645.90E0B23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: luc Date: Fri Sep 28 14:56:45 2012 New Revision: 1391491 URL: http://svn.apache.org/viewvc?rev=1391491&view=rev Log: Fixed merging. Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java Modified: commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java?rev=1391491&r1=1391490&r2=1391491&view=diff ============================================================================== --- commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java (original) +++ commons/sandbox/nabla/trunk/src/main/java/org/apache/commons/nabla/algorithmic/forward/analysis/TrackingValue.java Fri Sep 28 14:56:45 2012 @@ -40,7 +40,7 @@ public class TrackingValue implements Va /** Instructions that produce this value. */ private Set producers; - /** Values that are merged with this value. */ + /** Values that are merged with this value (including the instance itself). */ private Set merged; /** Build a new value without any link to instructions. @@ -51,6 +51,7 @@ public class TrackingValue implements Va consumers = new HashSet(); producers = new HashSet(); merged = new HashSet(); + merged.add(this); } /** Get the wrapped {@link BasicValue}. @@ -103,20 +104,22 @@ public class TrackingValue implements Va public static void merge(final TrackingValue value1, final TrackingValue value2) { + if (value1.merged.contains(value2)) { + // the values have already been merged + return; + } + // merge the sets value1.consumers.addAll(value2.consumers); value1.producers.addAll(value2.producers); value1.merged.addAll(value2.merged); // share the merged sets - for (TrackingValue value : value2.merged) { + for (final TrackingValue value : value2.merged) { value.consumers = value1.consumers; value.producers = value1.producers; value.merged = value1.merged; } - value2.consumers = value1.consumers; - value2.producers = value1.producers; - value2.merged = value1.merged; }