Skip to content

Commit 7bb5471

Browse files
nicolasstuckinicolasstucki
committed
Whitelist fixed more stdlib sources.
1 parent 720754c commit 7bb5471

File tree

2 files changed

+51
-109
lines changed

2 files changed

+51
-109
lines changed

‎compiler/test/dotc/scala-collections.blacklist

Lines changed: 34 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -6,80 +6,17 @@
66
# |illegal redefinition of standard class AnyVal
77

88
../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala
9-
10-
../scala-scala/src/library/scala/collection/mutable/DefaultEntry.scala
11-
# 22 | "(kv: " + key + ", " + value + ")" + (if (next != null) " -> " + next.toString else "")
12-
# | ^^^^
13-
# | cyclic reference involving method toString
14-
15-
../scala-scala/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
16-
# 78 | override def toString() = imap.toString()
17-
# | ^^^^^^^^^^^^^^^
18-
# | missing argument for parameter index of method apply: (index: Int)Char
19-
20-
../scala-scala/src/library/scala/collection/mutable/LinkedHashMap.scala
21-
# 102 | protected class FilteredKeys(p: A => Boolean) extends super.FilteredKeys(p) {
22-
# | ^^^^^^^^^^^^^^^^^^^^
23-
# | cyclic inheritance: class FilteredKeys extends itself
24-
# ...
25-
26-
../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala
27-
# 73 | })
28-
# | ^
29-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
30-
# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable
31-
# ...
9+
# assertion failed
10+
# at dotty.tools.dotc.core.TypeComparer.dotty$tools$dotc$core$TypeComparer$$monitoredIsSubType(TypeComparer.scala:141)
3211

3312
../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala
34-
# 68 | })
35-
# | ^
36-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
37-
# | required: scala.collection.script.Message[(A, B)] & scala.collection.mutable.Undoable
38-
39-
../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
40-
# 52 | })
41-
# | ^
42-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
43-
# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable
44-
45-
../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
46-
# 102 | override def toString() = synchronized { super.toString() }
47-
# | ^^^^^^^^^^^^^^^^
48-
# | missing argument for parameter index of method apply: (index: Int)Char
49-
50-
../scala-scala/src/library/scala/collection/mutable/UnrolledBuffer.scala
51-
# 347 | override def toString = array.take(size).mkString("Unrolled[" + array.length + "](", ", ", ")") + " -> " + (if (next ne null) next.toString else "")
52-
# | ^^^^
53-
# | cyclic reference involving method toString
13+
# assertion failed: data race? overwriting symbol of type ((kv: (A, B))scala.collection.mutable.ObservableMap[A, B](ObservableMap.this))(ObservableMap.this.super$+=)
5414

5515
../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
56-
# assertion failed
57-
58-
../scala-scala/src/library/scala/collection/parallel/mutable/ParArray.scala
59-
# 648 | class Map[S](f: T => S, targetarr: Array[Any], offset: Int, howmany: Int) extends Task[Unit, Map[S]] {
60-
# | ^
61-
# | overriding class Map in trait ParIterableLike;
62-
# | class Map cannot be used here - class definitions cannot be overridden
63-
64-
../scala-scala/src/library/scala/collection/parallel/mutable/ParMap.scala
65-
# 42 | override def updated [U >: V](key: K, value: U): ParMap[K, U] = this + ((key, value))
66-
# | ^^^^^^^^^^^^^^^^^^^^^
67-
# | found: scala.collection.parallel.ParMap[K, U]
68-
# | required: scala.collection.parallel.mutable.ParMap'[K, U]
69-
# |
70-
# | where: ParMap is a trait in package parallel
71-
# | ParMap' is a trait in package mutable
72-
73-
74-
../scala-scala/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
75-
# 91 | new { val chain = c } with ResizableParArrayCombiner[T] // was: with EnvironmentPassingCombiner[T, ParArray[T]]
76-
# | ^
77-
# | early definitions are not supported; use trait parameters instead
78-
79-
../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
80-
# 136 | it.iterated = this.iterated
81-
# | ^^^^^^^^^^^
82-
# | value `iterated` is not a member of scala.collection.concurrent.TrieMapIterator[K, V](it)
16+
# assertion failed: data race? overwriting symbol of type ((xs: scala.collection.TraversableOnce[A])scala.collection.mutable.SynchronizedBuffer[A](SynchronizedBuffer.this))(SynchronizedBuffer.this.super$++=), long form = TermRef(ThisType(TypeRef(ThisType(TypeRef(NoPrefix,mutable)),SynchronizedBuffer)),scala$collection$mutable$SynchronizedBuffer$$super$$plus$plus$eq)/withSig(Signature(List(scala.collection.TraversableOnce),scala.collection.mutable.SynchronizedBuffer)) of class class dotty.tools.dotc.core.Types$TermRefWithSignature,
17+
# at scala.Predef$.assert(Predef.scala:165)
18+
# at dotty.tools.dotc.core.Types$NamedType.checkSymAssign(Types.scala:1490)
19+
# at dotty.tools.dotc.core.Types$NamedType.setDenot(Types.scala:1525)
8320

8421
../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala
8522
# assertion failed: found: => scala.collection.parallel.Combiner[(U, S), That](ParIterableLike.this.BuilderOps[(U, S), That]#asCombiner)
@@ -91,37 +28,46 @@
9128
# at dotty.tools.dotc.typer.Typer$$anonfun$typed$2.apply(Typer.scala:1527)
9229

9330
../scala-scala/src/library/scala/collection/parallel/ParMap.scala
31+
# assertion failed
32+
# at scala.Predef$.assert(Predef.scala:151)
33+
# at dotty.tools.dotc.core.TypeComparer.dotty$tools$dotc$core$TypeComparer$$monitoredIsSubType(TypeComparer.scala:141)
34+
# at dotty.tools.dotc.core.TypeComparer$$anonfun$isSubType$1.apply$mcZ$sp(TypeComparer.scala:113)
35+
9436
../scala-scala/src/library/scala/collection/parallel/ParMapLike.scala
37+
# at scala.Predef$.assert(Predef.scala:151)
38+
# at dotty.tools.dotc.core.TypeComparer.dotty$tools$dotc$core$TypeComparer$$monitoredIsSubType(TypeComparer.scala:141)
39+
# at dotty.tools.dotc.core.TypeComparer$$anonfun$isSubType$1.apply$mcZ$sp(TypeComparer.scala:113)
9540

9641
../scala-scala/src/library/scala/collection/parallel/ParSeqLike.scala
97-
# 334 | protected trait Accessor[R, Tp] extends super.Accessor[R, Tp] {
98-
# | ^^^^^^^^^^^^^^^^^^^^^
99-
# | cyclic inheritance: trait Accessor extends itself
100-
101-
../scala-scala/src/library/scala/collection/parallel/RemainsIterator.scala
102-
# 617 | class Zipped[S](ti: SeqSplitter[S]) extends super.Zipped[S](ti) with SeqSplitter[(T, S)] {
103-
# | ^^^^^^^^^^^^^^^^^^
104-
# | cyclic inheritance: class Zipped extends itself
42+
# assertion failed: found: => scala.collection.parallel.Combiner[(U, S), That]((AnyRef & ParSeqLike.this.BuilderOps[(U, S), That])#asCombiner)
43+
# required: scala.collection.parallel.Combiner[(Any, S), That]
44+
# tree = this.builder2ops[(U, S)^, That^](bf.apply(this.repr)).asCombiner, took 21.014 sec
45+
# at scala.Predef$.assert(Predef.scala:165)
46+
# at dotty.tools.dotc.transform.TreeChecker$Checker.adapt(TreeChecker.scala:452)
47+
# at dotty.tools.dotc.typer.Typer$$anonfun$typed$2.apply(Typer.scala:1529)
10548

10649
../scala-scala/src/library/scala/collection/parallel/Tasks.scala
10750
# 429 | fjtask.body.result
10851
# | ^^^^^^^^^^^
10952
# | value `body` is not a member of ForkJoinTasks.this.WrappedTask[R, Tp](fjtask)
11053

111-
../scala-scala/src/library/scala/concurrent/SyncChannel.scala
112-
# 45 | writeReq.get
113-
# | ^^^^^^^^^^^^
114-
# | none of the overloaded alternatives of method get in class SyncVar with types
115-
# | (timeout: Long)Option[Boolean]
116-
# | => Boolean
117-
# | match expected type Unit
118-
11954
../scala-scala/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
12055
# assertion failed
12156

12257
../scala-scala/src/library/scala/concurrent/package.scala
123-
# assertion failed
124-
58+
# assertion failed: found: scala.concurrent.Awaitable[T]
59+
# required: scala.concurrent.Awaitable[T](awaitable)
60+
# tree = <special-ops>.<dummy-apply>[scala.concurrent.Awaitable[T]](
61+
# {
62+
# def $anonfun(): scala.concurrent.Awaitable[T] = awaitable.ready(atMost)(scala.concurrent.AwaitPermission)
63+
# closure($anonfun)
64+
# }
65+
# ), took 25.209 sec
66+
# at scala.Predef$.assert(Predef.scala:165)
67+
# at dotty.tools.dotc.transform.TreeChecker$Checker.adapt(TreeChecker.scala:452)
68+
# at dotty.tools.dotc.typer.ProtoTypes$FunProto.typedArg(ProtoTypes.scala:236)
69+
# at dotty.tools.dotc.typer.Applications$ApplyToUntyped.typedArg(Applications.scala:551)
70+
# at dotty.tools.dotc.typer.Applications$ApplyToUntyped.typedArg(Applications.scala:549)
12571

12672
../scala-scala/src/library/scala/Function1.scala
12773
# assertion failed: duplicate class Function1#14914; previous was class Function1#14919
@@ -148,22 +94,6 @@
14894
../scala-scala/src/library/scala/Function8.scala
14995
../scala-scala/src/library/scala/Function9.scala
15096

151-
../scala-scala/src/library/scala/io/BufferedSource.scala
152-
# 38 | override lazy val iter = (
153-
# | ^
154-
# | overriding getter iter in class Source of type => collection.Iterator[Char];
155-
# | lazy value iter of type collection.Iterator[Char] may not override a non-lazy value
156-
157-
../scala-scala/src/library/scala/io/Source.scala
158-
# 303 | report(pos, msg, out)
159-
# | ^^^
160-
# | not found: msg
161-
162-
../scala-scala/src/library/scala/ref/WeakReference.scala
163-
# 33 | if (x != null) Some(x) else None
164-
# | ^^^^^^^^^^^
165-
# | Values of types wr.underlying.java$lang$ref$WeakReference$$T and Null cannot be compared with == or !=
166-
16797
../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
16898
# 51 | import Manifest._
16999
# | ^^^^^^^^
@@ -204,10 +134,6 @@
204134

205135
../scala-scala/src/library/scala/text/Document.scala
206136

207-
# 19 |case class Tuple1[@specialized(Int, Long, Double) +T1](_1: T1)
208-
# | ^
209-
# | value _1 is already defined as method _1: => T1
210-
211137
../scala-scala/src/library/scala/util/control/Exception.scala
212138
# scala.MatchError: PostfixOp(Select(Ident(pf),isDefinedAt),_) (of class dotty.tools.dotc.ast.untpd$PostfixOp)
213139
# at dotty.tools.dotc.ast.Trees$Instance$TreeAccumulator.foldOver(Trees.scala:1173)

‎compiler/test/dotc/scala-collections.whitelist

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
../scala-scala/src/library/scala/collection/mutable/Buffer.scala
311311
../scala-scala/src/library/scala/collection/mutable/BufferProxy.scala
312312
../scala-scala/src/library/scala/collection/mutable/Cloneable.scala
313+
../scala-scala/src/library/scala/collection/mutable/DefaultEntry.scala
313314
../scala-scala/src/library/scala/collection/mutable/DefaultMapModel.scala
314315
../scala-scala/src/library/scala/collection/mutable/DoubleLinkedList.scala
315316
../scala-scala/src/library/scala/collection/mutable/DoubleLinkedListLike.scala
@@ -319,6 +320,7 @@
319320
../scala-scala/src/library/scala/collection/mutable/HashSet.scala
320321
../scala-scala/src/library/scala/collection/mutable/HashTable.scala
321322
../scala-scala/src/library/scala/collection/mutable/History.scala
323+
../scala-scala/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
322324
../scala-scala/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
323325
../scala-scala/src/library/scala/collection/mutable/IndexedSeqLike.scala
324326
../scala-scala/src/library/scala/collection/mutable/IndexedSeqOptimized.scala
@@ -329,6 +331,7 @@
329331
../scala-scala/src/library/scala/collection/mutable/LinkedHashSet.scala
330332
../scala-scala/src/library/scala/collection/mutable/LinkedList.scala
331333
../scala-scala/src/library/scala/collection/mutable/LinkedListLike.scala
334+
../scala-scala/src/library/scala/collection/mutable/LinkedHashMap.scala
332335
../scala-scala/src/library/scala/collection/mutable/ListMap.scala
333336
../scala-scala/src/library/scala/collection/mutable/LongMap.scala
334337
../scala-scala/src/library/scala/collection/mutable/Map.scala
@@ -337,6 +340,8 @@
337340
../scala-scala/src/library/scala/collection/mutable/MapProxy.scala
338341
../scala-scala/src/library/scala/collection/mutable/MultiMap.scala
339342
../scala-scala/src/library/scala/collection/mutable/MutableList.scala
343+
../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala
344+
../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
340345
../scala-scala/src/library/scala/collection/mutable/OpenHashMap.scala
341346
../scala-scala/src/library/scala/collection/mutable/PriorityQueue.scala
342347
../scala-scala/src/library/scala/collection/mutable/PriorityQueueProxy.scala
@@ -358,11 +363,13 @@
358363
../scala-scala/src/library/scala/collection/mutable/Subscriber.scala
359364
../scala-scala/src/library/scala/collection/mutable/SynchronizedMap.scala
360365
../scala-scala/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
366+
../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
361367
../scala-scala/src/library/scala/collection/mutable/SynchronizedSet.scala
362368
../scala-scala/src/library/scala/collection/mutable/SynchronizedStack.scala
363369
../scala-scala/src/library/scala/collection/mutable/Traversable.scala
364370
../scala-scala/src/library/scala/collection/mutable/TreeSet.scala
365371
../scala-scala/src/library/scala/collection/mutable/Undoable.scala
372+
../scala-scala/src/library/scala/collection/mutable/UnrolledBuffer.scala
366373
../scala-scala/src/library/scala/collection/mutable/WeakHashMap.scala
367374

368375
../scala-scala/src/library/scala/collection/convert/DecorateAsJava.scala
@@ -411,8 +418,10 @@
411418
../scala-scala/src/library/scala/beans/ScalaBeanInfo.scala
412419

413420
../scala-scala/src/library/scala/io/AnsiColor.scala
421+
../scala-scala/src/library/scala/io/BufferedSource.scala
414422
../scala-scala/src/library/scala/io/Codec.scala
415423
../scala-scala/src/library/scala/io/Position.scala
424+
../scala-scala/src/library/scala/io/Source.scala
416425
../scala-scala/src/library/scala/io/StdIn.scala
417426

418427
../scala-scala/src/library/scala/math/BigDecimal.scala
@@ -424,10 +433,11 @@
424433
../scala-scala/src/library/scala/ref/ReferenceQueue.scala
425434
../scala-scala/src/library/scala/ref/ReferenceWrapper.scala
426435
../scala-scala/src/library/scala/ref/SoftReference.scala
436+
../scala-scala/src/library/scala/ref/WeakReference.scala
427437

428438
../scala-scala/src/library/scala/reflect/macros/internal/macroImpl.scala
429-
../scala-scala/src/library/scala/reflect/NoManifest.scala
430439
../scala-scala/src/library/scala/reflect/OptManifest.scala
440+
../scala-scala/src/library/scala/reflect/NoManifest.scala
431441

432442
../scala-scala/src/library/scala/Responder.scala
433443

@@ -453,22 +463,27 @@
453463
../scala-scala/src/library/scala/concurrent/Lock.scala
454464
../scala-scala/src/library/scala/concurrent/ManagedBlocker.scala
455465
../scala-scala/src/library/scala/concurrent/Promise.scala
466+
../scala-scala/src/library/scala/concurrent/SyncChannel.scala
456467
../scala-scala/src/library/scala/concurrent/SyncVar.scala
457468
../scala-scala/src/library/scala/concurrent/TaskRunner.scala
458469
../scala-scala/src/library/scala/concurrent/ThreadPoolRunner.scala
459470

460471
../scala-scala/src/library/scala/collection/parallel/Combiner.scala
461472
../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala
462473
../scala-scala/src/library/scala/collection/parallel/mutable/package.scala
474+
../scala-scala/src/library/scala/collection/parallel/mutable/ParArray.scala
463475
../scala-scala/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
464476
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashMap.scala
465477
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashSet.scala
466478
../scala-scala/src/library/scala/collection/parallel/mutable/ParHashTable.scala
467479
../scala-scala/src/library/scala/collection/parallel/mutable/ParIterable.scala
480+
../scala-scala/src/library/scala/collection/parallel/mutable/ParMap.scala
468481
../scala-scala/src/library/scala/collection/parallel/mutable/ParMapLike.scala
469482
../scala-scala/src/library/scala/collection/parallel/mutable/ParSeq.scala
470483
../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
471484
../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
485+
../scala-scala/src/library/scala/collection/parallel/mutable/ParTrieMap.scala
486+
../scala-scala/src/library/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala
472487
../scala-scala/src/library/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala
473488

474489
../scala-scala/src/library/scala/collection/parallel/package.scala
@@ -477,6 +492,7 @@
477492
../scala-scala/src/library/scala/collection/parallel/ParSet.scala
478493
../scala-scala/src/library/scala/collection/parallel/ParSetLike.scala
479494
../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
495+
../scala-scala/src/library/scala/collection/parallel/RemainsIterator.scala
480496
../scala-scala/src/library/scala/collection/parallel/Splitter.scala
481497
../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala
482498

0 commit comments

Comments
 (0)