@@ -603,12 +603,12 @@ func inlnode(n *Node) *Node {
603
603
fmt .Printf ("%v:call to func %+v\n " , n .Line (), n .Left )
604
604
}
605
605
if n .Left .Func != nil && n .Left .Func .Inl .Len () != 0 && ! isIntrinsicCall (n ) { // normal case
606
- n = mkinlcall (n , n .Left , n . Isddd () )
606
+ n = mkinlcall (n , n .Left )
607
607
} else if n .Left .isMethodExpression () && asNode (n .Left .Sym .Def ) != nil {
608
- n = mkinlcall (n , asNode (n .Left .Sym .Def ), n . Isddd () )
608
+ n = mkinlcall (n , asNode (n .Left .Sym .Def ))
609
609
} else if n .Left .Op == OCLOSURE {
610
610
if f := inlinableClosure (n .Left ); f != nil {
611
- n = mkinlcall (n , f , n . Isddd () )
611
+ n = mkinlcall (n , f )
612
612
}
613
613
} else if n .Left .Op == ONAME && n .Left .Name != nil && n .Left .Name .Defn != nil {
614
614
if d := n .Left .Name .Defn ; d .Op == OAS && d .Right .Op == OCLOSURE {
@@ -634,7 +634,7 @@ func inlnode(n *Node) *Node {
634
634
}
635
635
break
636
636
}
637
- n = mkinlcall (n , f , n . Isddd () )
637
+ n = mkinlcall (n , f )
638
638
}
639
639
}
640
640
}
@@ -653,7 +653,7 @@ func inlnode(n *Node) *Node {
653
653
Fatalf ("no function definition for [%p] %+v\n " , n .Left .Type , n .Left .Type )
654
654
}
655
655
656
- n = mkinlcall (n , asNode (n .Left .Type .FuncType ().Nname ), n . Isddd () )
656
+ n = mkinlcall (n , asNode (n .Left .Type .FuncType ().Nname ))
657
657
}
658
658
659
659
lineno = lno
@@ -754,7 +754,7 @@ func (v *reassignVisitor) visitList(l Nodes) *Node {
754
754
755
755
// The result of mkinlcall MUST be assigned back to n, e.g.
756
756
// n.Left = mkinlcall(n.Left, fn, isddd)
757
- func mkinlcall (n * Node , fn * Node , isddd bool ) * Node {
757
+ func mkinlcall (n * Node , fn * Node ) * Node {
758
758
save_safemode := safemode
759
759
760
760
// imported functions may refer to unsafe as long as the
@@ -764,7 +764,7 @@ func mkinlcall(n *Node, fn *Node, isddd bool) *Node {
764
764
if pkg != localpkg && pkg != nil {
765
765
safemode = false
766
766
}
767
- n = mkinlcall1 (n , fn , isddd )
767
+ n = mkinlcall1 (n , fn )
768
768
safemode = save_safemode
769
769
return n
770
770
}
@@ -790,7 +790,7 @@ var inlgen int
790
790
// parameters.
791
791
// The result of mkinlcall1 MUST be assigned back to n, e.g.
792
792
// n.Left = mkinlcall1(n.Left, fn, isddd)
793
- func mkinlcall1 (n , fn * Node , isddd bool ) * Node {
793
+ func mkinlcall1 (n , fn * Node ) * Node {
794
794
if fn .Func .Inl .Len () == 0 {
795
795
// No inlinable body.
796
796
return n
@@ -958,7 +958,7 @@ func mkinlcall1(n, fn *Node, isddd bool) *Node {
958
958
// For ordinary parameters or variadic parameters in
959
959
// dotted calls, just add the variable to the
960
960
// assignment list, and we're done.
961
- if ! param .Isddd () || isddd {
961
+ if ! param .Isddd () || n . Isddd () {
962
962
as .List .Append (tinlvar (param , inlvars ))
963
963
continue
964
964
}
0 commit comments