Skip to content

Commit c444f1a

Browse files
authored
Merge pull request #5645 from milessabin/topic/pickling-fixes
Position inlined bindings correctly and tidy up pickling test blacklists
2 parents 4d10f68 + 7c5dbca commit c444f1a

File tree

3 files changed

+1
-47
lines changed

3 files changed

+1
-47
lines changed

compiler/src/dotty/tools/dotc/typer/Inliner.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
694694
*/
695695
def newBinding(sym: TermSymbol, rhs: Tree): Unit = {
696696
sym.info = rhs.tpe.widenTermRefExpr
697-
bindingsBuf += ValDef(sym, constToLiteral(rhs))
697+
bindingsBuf += ValDef(sym, constToLiteral(rhs)).withPos(sym.pos)
698698
}
699699

700700
def searchImplicit(sym: TermSymbol, tpt: Tree) = {
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,12 @@
1-
depfuntype.scala
2-
i1753.scala
31
i1812.scala
42
i1867.scala
53
i3067.scala
6-
i3149.scala
7-
i3692.scala
8-
i4125.scala
9-
implicit-dep.scala
10-
inline-access-levels
11-
inline-rewrite.scala
12-
inline-caseclass.scala
13-
macro-with-array
14-
macro-with-type
154
matchtype.scala
16-
phantom-Eq2
17-
power-macro
18-
quote-lift-inline-params
19-
quote-nested-object
20-
scala2traits
21-
sepComp
225
seqtype-cycle
23-
t1029
24-
t1942
256
t247.scala
267
t2712-5.scala
27-
t2726
28-
t2741
298
t284-pos.scala
309
t3249
31-
t3419
32-
t3452f.scala
3310
t3486
3411
t3612.scala
35-
t3864
36-
t3999
37-
t4757
38-
t5013
39-
t5031_3
40-
t5504
41-
t6028
42-
t6976
43-
t7264
44-
t7532b
45-
t8062
4612
typelevel0.scala
47-
typeclass-encoding2.scala
48-
typeclass-encoding3.scala
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
Course-2002-07.scala
21
eff-dependent.scala
3-
extension-methods.scala
4-
i5257.scala
5-
lazy-implicit-lists.scala
6-
lazy-implicit-nums.scala
7-
lazy-traits.scala
82
t3452d
93
t3452e
104
t3452g
115
t7374
12-
t8133
13-
t8133b
146
tuples1.scala
157
tuples1a.scala
16-
implicitMatch.scala
17-
typeclass-derivation1.scala
188
typeclass-derivation2.scala

0 commit comments

Comments
 (0)