Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x

Conflicts:
	bincompat-backward.whitelist.conf
	bincompat-forward.whitelist.conf
	src/reflect/scala/reflect/internal/SymbolTable.scala
	src/reflect/scala/reflect/internal/util/WeakHashSet.scala
	src/reflect/scala/reflect/runtime/JavaMirrors.scala

1 files changed, 17 insertions, 0 deletions

diff --git a/test/files/run/t7775.scala b/test/files/run/t7775.scala
new file mode 100644
index 0000000000..5fb0327611
--- /dev/null
+++ b/test/files/run/t7775.scala
@@ -0,0 +1,17 @@
+import scala.concurrent.{duration, future, Await, ExecutionContext}
+import scala.tools.nsc.Settings
+import ExecutionContext.Implicits.global
+
+// Was failing pretty regularly with a ConcurrentModificationException as
+// WrappedProperties#systemProperties iterated directly over the mutable
+// global system properties map.
+object Test {
+  def main(args: Array[String]) {
+    val tries = 1000 // YMMV
+    val compiler = future {
+      for(_ <- 1 to tries) new Settings(_ => {})
+    }
+    for(i <- 1 to tries * 10) System.setProperty(s"foo$i", i.toString)
+    Await.result(compiler, duration.Duration.Inf)
+  }
+}