Skip to content

Commit fbb3d1c

Browse files
som-snyttsom-snytt
committed
Suspend asserts on array copy count
1 parent e15d726 commit fbb3d1c

File tree

10 files changed

+32
-32
lines changed

10 files changed

+32
-32
lines changed

‎src/compiler/scala/tools/nsc/transform/async/AnfTransform.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ private[async] trait AnfTransform extends TransformUtils {
269269
onTail(ts)
270270
case i =>
271271
val group = new Array[T](i + 1)
272-
val copied = ts.copyToArray(group)
273-
assert(copied == group.length, s"$copied != ${group.length}")
272+
@annotation.unused val copied = ts.copyToArray(group)
273+
//assert(copied == group.length, s"$copied != ${group.length}")
274274
onGroup(group)
275275
foreachGroupsEndingWith(ts.drop(i + 1))(isGroupEnd, onGroup, onTail)
276276
}

‎src/compiler/scala/tools/nsc/transform/patmat/Logic.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ trait Logic extends Debugging {
230230
checkPair(a, b) || checkPair(a, c) || checkPair(b, c)
231231
} else {
232232
val ops = new Array[Prop](size)
233-
val copied = ops0.copyToArray(ops)
234-
assert(copied == ops.length, "")
233+
@annotation.unused val copied = ops0.copyToArray(ops)
234+
//assert(copied == ops.length, "")
235235
var i = 0
236236
val len = ops.length
237237
while (i < len - 1) {

‎src/compiler/scala/tools/nsc/transform/patmat/Solving.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ trait Solving extends Logic {
356356
// scala/bug#6942:
357357
// CNF(P1 /\ ... /\ PN) == CNF(P1) ++ CNF(...) ++ CNF(PN)
358358
val cnfs = new Array[Solvable](props.size)
359-
val copied = props.iterator.map(x => cnfFor(x)).copyToArray(cnfs)
360-
assert(copied == cnfs.length, "")
359+
@annotation.unused val copied = props.iterator.map(x => cnfFor(x)).copyToArray(cnfs)
360+
//assert(copied == cnfs.length, "")
361361
new Solvable(cnfs.flatten[Clause](_.cnf, reflect.classTag[Clause]), cnfs.head.symbolMapping)
362362
case p =>
363363
cnfFor(p)

‎src/library/scala/collection/ArrayOps.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,8 +1478,8 @@ final class ArrayOps[A](private val xs: Array[A]) extends AnyVal {
14781478
/** Create a copy of this array with the specified element type. */
14791479
def toArray[B >: A: ClassTag]: Array[B] = {
14801480
val destination = new Array[B](xs.length)
1481-
val copied = copyToArray(destination, 0)
1482-
assert(copied == xs.length)
1481+
@annotation.unused val copied = copyToArray(destination, 0)
1482+
//assert(copied == xs.length)
14831483
destination
14841484
}
14851485

‎src/library/scala/collection/IterableOnce.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,8 +1339,8 @@ trait IterableOnceOps[+A, +CC[_], +C] extends Any { this: IterableOnce[A] =>
13391339
def toArray[B >: A: ClassTag]: Array[B] =
13401340
if (knownSize >= 0) {
13411341
val destination = new Array[B](knownSize)
1342-
val copied = copyToArray(destination, 0)
1343-
assert(copied == destination.length)
1342+
@annotation.unused val copied = copyToArray(destination, 0)
1343+
//assert(copied == destination.length)
13441344
destination
13451345
}
13461346
else mutable.ArrayBuilder.make[B].addAll(this).result()

‎src/library/scala/collection/Seq.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ trait SeqOps[+A, +CC[_], +C] extends Any
723723
else if (len > 1) {
724724
b.sizeHint(len)
725725
val arr = new Array[Any](len)
726-
val copied = copyToArray(arr)
727-
assert(copied == len)
726+
@annotation.unused val copied = copyToArray(arr)
727+
//assert(copied == len)
728728
java.util.Arrays.sort(arr.asInstanceOf[Array[AnyRef]], ord.asInstanceOf[Ordering[AnyRef]])
729729
var i = 0
730730
while (i < len) {

‎src/library/scala/collection/SeqView.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ object SeqView {
163163
else if (len == 1) List(underlying.head)
164164
else {
165165
val arr = new Array[Any](len) // Array[Any] =:= Array[AnyRef]
166-
val copied = underlying.copyToArray(arr)
167-
assert(copied == len)
166+
@annotation.unused val copied = underlying.copyToArray(arr)
167+
//assert(copied == len)
168168
java.util.Arrays.sort(arr.asInstanceOf[Array[AnyRef]], ord.asInstanceOf[Ordering[AnyRef]])
169169
// casting the Array[AnyRef] to Array[A] and creating an ArraySeq from it
170170
// is safe because:

‎src/library/scala/collection/immutable/Vector.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ object Vector extends StrictOptimizedSeqFactory[Vector] {
4747
as.unsafeArray.asInstanceOf[Arr1]
4848
case it: Iterable[E] =>
4949
val a1 = new Arr1(knownSize)
50-
val copied = it.copyToArray(a1.asInstanceOf[Array[Any]])
51-
assert(copied == knownSize)
50+
@annotation.unused val copied = it.copyToArray(a1.asInstanceOf[Array[Any]])
51+
//assert(copied == knownSize)
5252
a1
5353
case _ =>
5454
val a1 = new Arr1(knownSize)
55-
val copied = it.iterator.copyToArray(a1.asInstanceOf[Array[Any]])
56-
assert(copied == knownSize)
55+
@annotation.unused val copied = it.iterator.copyToArray(a1.asInstanceOf[Array[Any]])
56+
//assert(copied == knownSize)
5757
a1.asInstanceOf[Arr1]
5858
}
5959
new Vector1[E](a1)
@@ -2194,8 +2194,8 @@ private object VectorStatics {
21942194
case s =>
21952195
val prefix1b = new Arr1(prefix1.length + s)
21962196
System.arraycopy(prefix1, 0, prefix1b, s, prefix1.length)
2197-
val copied = it.copyToArray(prefix1b.asInstanceOf[Array[Any]], 0)
2198-
assert(copied == s)
2197+
@annotation.unused val copied = it.copyToArray(prefix1b.asInstanceOf[Array[Any]], 0)
2198+
//assert(copied == s)
21992199
prefix1b
22002200
}
22012201
} else null
@@ -2204,8 +2204,8 @@ private object VectorStatics {
22042204
if(s > 0 && s <= WIDTH-prefix1.length) {
22052205
val prefix1b = new Arr1(prefix1.length + s)
22062206
System.arraycopy(prefix1, 0, prefix1b, s, prefix1.length)
2207-
val copied = it.iterator.copyToArray(prefix1b.asInstanceOf[Array[Any]], 0)
2208-
assert(copied == s)
2207+
@annotation.unused val copied = it.iterator.copyToArray(prefix1b.asInstanceOf[Array[Any]], 0)
2208+
//assert(copied == s)
22092209
prefix1b
22102210
} else null
22112211
}
@@ -2218,17 +2218,17 @@ private object VectorStatics {
22182218
case 1 => copyAppend(suffix1, it.head.asInstanceOf[AnyRef])
22192219
case s =>
22202220
val suffix1b = copyOf(suffix1, suffix1.length + s)
2221-
val copied = it.copyToArray(suffix1b.asInstanceOf[Array[Any]], suffix1.length)
2222-
assert(copied == s)
2221+
@annotation.unused val copied = it.copyToArray(suffix1b.asInstanceOf[Array[Any]], suffix1.length)
2222+
//assert(copied == s)
22232223
suffix1b
22242224
}
22252225
} else null
22262226
case it =>
22272227
val s = it.knownSize
22282228
if(s > 0 && s <= WIDTH-suffix1.length) {
22292229
val suffix1b = copyOf(suffix1, suffix1.length + s)
2230-
val copied = it.iterator.copyToArray(suffix1b.asInstanceOf[Array[Any]], suffix1.length)
2231-
assert(copied == s)
2230+
@annotation.unused val copied = it.iterator.copyToArray(suffix1b.asInstanceOf[Array[Any]], suffix1.length)
2231+
//assert(copied == s)
22322232
suffix1b
22332233
} else null
22342234
}

‎src/library/scala/collection/mutable/ArrayDeque.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class ArrayDeque[A] protected (
112112
case srcLength if mustGrow(srcLength + n) =>
113113
val finalLength = srcLength + n
114114
val array2 = ArrayDeque.alloc(finalLength)
115-
val copied = it.copyToArray(array2.asInstanceOf[Array[A]])
116-
assert(copied == srcLength)
115+
@annotation.unused val copied = it.copyToArray(array2.asInstanceOf[Array[A]])
116+
//assert(copied == srcLength)
117117
copySliceToArray(srcStart = 0, dest = array2, destStart = srcLength, maxItems = n)
118118
reset(array = array2, start = 0, end = finalLength)
119119

@@ -200,8 +200,8 @@ class ArrayDeque[A] protected (
200200
if (mustGrow(finalLength)) {
201201
val array2 = ArrayDeque.alloc(finalLength)
202202
copySliceToArray(srcStart = 0, dest = array2, destStart = 0, maxItems = idx)
203-
val copied = it.copyToArray(array2.asInstanceOf[Array[A]], idx)
204-
assert(copied == srcLength)
203+
@annotation.unused val copied = it.copyToArray(array2.asInstanceOf[Array[A]], idx)
204+
//assert(copied == srcLength)
205205
copySliceToArray(srcStart = idx, dest = array2, destStart = idx + srcLength, maxItems = n)
206206
reset(array = array2, start = 0, end = finalLength)
207207
} else if (2*idx >= n) { // Cheaper to shift the suffix right

‎src/reflect/scala/reflect/internal/BaseTypeSeqs.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ trait BaseTypeSeqs {
257257
}
258258
}
259259
val elems = new Array[Type](btsSize)
260-
val copied = buf.copyToArray(elems, 0)
261-
assert(copied == btsSize, "array copied")
260+
@annotation.unused val copied = buf.copyToArray(elems, 0)
261+
//assert(copied == btsSize, "array copied")
262262
// Console.println("computed baseTypeSeq of " + tsym.tpe + " " + parents + ": "+elems.toString)//DEBUG
263263
newBaseTypeSeq(parents, elems)
264264
}

0 commit comments

Comments
 (0)