From 2d946110bccf12e9d0f2b6f6f0076a4437430c36 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 5 Mar 2015 12:55:21 +0100 Subject: [PATCH] use checkSet only in extra sanity checks mode --- .../containers/ChangeBufferingList.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/containers/ChangeBufferingList.java b/platform/lang-impl/src/com/intellij/util/indexing/containers/ChangeBufferingList.java index a1373c06a23f..2036ba202010 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/containers/ChangeBufferingList.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/containers/ChangeBufferingList.java @@ -19,7 +19,7 @@ import com.intellij.util.indexing.DebugAssertions; import com.intellij.util.indexing.ValueContainer; import gnu.trove.TIntProcedure; -import static com.intellij.util.indexing.DebugAssertions.DEBUG; +import static com.intellij.util.indexing.DebugAssertions.EXTRA_SANITY_CHECKS; /** * Class buffers changes in 2 modes: @@ -48,7 +48,7 @@ public class ChangeBufferingList implements Cloneable { } else { changes = new int[length]; } - checkSet = DEBUG ? new IdSet(length) : null; + checkSet = EXTRA_SANITY_CHECKS ? new IdSet(length) : null; } static int[] calcMinMax(int[] set, int length) { @@ -63,7 +63,7 @@ public class ChangeBufferingList implements Cloneable { public void add(int value) { ensureCapacity(1); - if (DEBUG) checkSet.add(value); + if (checkSet != null) checkSet.add(value); RandomAccessIntContainer intContainer = randomAccessContainer; if (intContainer == null) { addChange(value); @@ -79,7 +79,7 @@ public class ChangeBufferingList implements Cloneable { } public void remove(int value) { - if (DEBUG) checkSet.remove(value); + if (checkSet != null) checkSet.remove(value); RandomAccessIntContainer intContainer = randomAccessContainer; if (intContainer == null) { ensureCapacity(1); @@ -143,7 +143,7 @@ public class ChangeBufferingList implements Cloneable { } else { idSet = new IdBitSet(minMax, 0); } - } else if (DEBUG) { + } else if (checkSet != null) { idSet = (RandomAccessIntContainer)randomAccessContainer.clone(); } else { idSet = randomAccessContainer; @@ -162,7 +162,7 @@ public class ChangeBufferingList implements Cloneable { } } - if (DEBUG) { + if (checkSet != null) { DebugAssertions.assertTrue(checkSet.size() == idSet.size()); final RandomAccessIntContainer finalIdSet = idSet; checkSet.forEach(new TIntProcedure() { @@ -223,12 +223,12 @@ public class ChangeBufferingList implements Cloneable { public boolean isEmpty() { if (randomAccessContainer == null) { if (changes == null) { - if (DEBUG) DebugAssertions.assertTrue(checkSet.isEmpty()); + if (checkSet != null) DebugAssertions.assertTrue(checkSet.isEmpty()); return true; } if (!hasRemovals) { boolean b = length == 0; - if (DEBUG) DebugAssertions.assertTrue(b == checkSet.isEmpty()); + if (checkSet != null) DebugAssertions.assertTrue(b == checkSet.isEmpty()); return b; } } @@ -239,7 +239,7 @@ public class ChangeBufferingList implements Cloneable { public ValueContainer.IntPredicate intPredicate() { final ValueContainer.IntPredicate predicate = getRandomAccessContainer().intPredicate(); - if (DEBUG) { + if (checkSet != null) { return new ValueContainer.IntPredicate() { @Override public boolean contains(int id) {