Merge remote-tracking branch 'origin/2.12.x' into perf-backport/omnibus-first-pr

retronym · retronym · commit 6f60ed9715db · 2018-08-30T13:19:59.000+10:00
diff --git a/library/src/scala/collection/mutable/HashMap.scala b/library/src/scala/collection/mutable/HashMap.scala
@@ -87,7 +87,7 @@ extends AbstractMap[A, B]
       // Repeat search
       // because evaluation of `default` can bring entry with `key`
       val secondEntry = findEntry(key, newEntryIndex)
-      if (secondEntry == null) addEntry0(e, newEntryIndex)
+      if (secondEntry == null) addEntry(e, newEntryIndex)
       else secondEntry.value = default
       default
     }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ extends AbstractMap[A, B]`
`87`	`87`	`// Repeat search`
`88`	`88`	// because evaluation of `default` can bring entry with `key`
`89`	`89`	`val secondEntry = findEntry(key, newEntryIndex)`
`90`		`- if (secondEntry == null) addEntry0(e, newEntryIndex)`
	`90`	`+ if (secondEntry == null) addEntry(e, newEntryIndex)`
`91`	`91`	`else secondEntry.value = default`
`92`	`92`	`default`
`93`	`93`	`}`