gopherjs
diff --git a/‎compiler/decls.go
Lines changed: 2 additions & 2 deletions b/‎compiler/decls.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎compiler/expressions.go
Lines changed: 1 addition & 3 deletions b/‎compiler/expressions.go
Lines changed: 1 addition & 3 deletions
diff --git a/‎compiler/internal/dce/README.md
Lines changed: 600 additions & 0 deletions b/‎compiler/internal/dce/README.md
Lines changed: 600 additions & 0 deletions
diff --git a/‎compiler/internal/dce/collector.go
Lines changed: 12 additions & 12 deletions b/‎compiler/internal/dce/collector.go
Lines changed: 12 additions & 12 deletions
@@ -320,7 +320,7 @@ func (fc *funcContext) newFuncDecl(fun *ast.FuncDecl, inst typeparams.Instance)
 		Blocking:    fc.pkgCtx.IsBlocking(o),
 		LinkingName: symbol.New(o),
 	}
-	d.Dce().SetName(o)
+	d.Dce().SetName(o, inst.TArgs...)
 
 	if typesutil.IsMethod(o) {
 		recv := typesutil.RecvType(o.Type().(*types.Signature)).Obj()
@@ -450,7 +450,7 @@ func (fc *funcContext) newNamedTypeInstDecl(inst typeparams.Instance) (*Decl, er
 
 	underlying := instanceType.Underlying()
 	d := &Decl{}
-	d.Dce().SetName(inst.Object)
+	d.Dce().SetName(inst.Object, inst.TArgs...)
 	fc.pkgCtx.CollectDCEDeps(d, func() {
 		// Code that declares a JS type (i.e. prototype) for each Go type.
 		d.DeclCode = fc.CatchOutput(0, func() {
 
@@ -591,9 +591,7 @@ func (fc *funcContext) translateExpr(expr ast.Expr) *expression {
 		case types.MethodVal:
 			return fc.formatExpr(`$methodVal(%s, "%s")`, fc.makeReceiver(e), sel.Obj().(*types.Func).Name())
 		case types.MethodExpr:
-			if !sel.Obj().Exported() {
-				fc.pkgCtx.DeclareDCEDep(sel.Obj())
-			}
+			fc.pkgCtx.DeclareDCEDep(sel.Obj(), inst.TArgs...)
 			if _, ok := sel.Recv().Underlying().(*types.Interface); ok {
 				return fc.formatExpr(`$ifaceMethodExpr("%s")`, sel.Obj().(*types.Func).Name())
 			}
 
@@ -14,33 +14,33 @@ type Decl interface {
 // Collector is a tool to collect dependencies for a declaration
 // that'll be used in dead-code elimination (DCE).
 type Collector struct {
-	dependencies map[types.Object]struct{}
+	dce *Info
 }
 
 // CollectDCEDeps captures a list of Go objects (types, functions, etc.)
 // the code translated inside f() depends on. Then sets those objects
 // as dependencies of the given dead-code elimination info.
 //
 // Only one CollectDCEDeps call can be active at a time.
-// This will overwrite any previous dependencies collected for the given DCE.
 func (c *Collector) CollectDCEDeps(decl Decl, f func()) {
-	if c.dependencies != nil {
+	if c.dce != nil {
 		panic(errors.New(`called CollectDCEDeps inside another CollectDCEDeps call`))
 	}
 
-	c.dependencies = make(map[types.Object]struct{})
-	defer func() { c.dependencies = nil }()
+	c.dce = decl.Dce()
+	defer func() { c.dce = nil }()
 
 	f()
-
-	decl.Dce().setDeps(c.dependencies)
 }
 
 // DeclareDCEDep records that the code that is currently being transpiled
-// depends on a given Go object.
-func (c *Collector) DeclareDCEDep(o types.Object) {
-	if c.dependencies == nil {
-		return // Dependencies are not being collected.
+// depends on a given Go object with optional type arguments.
+//
+// The given optional type arguments are used to when the object is a
+// function with type parameters or anytime the object doesn't carry them.
+// If not given, this attempts to get the type arguments from the object.
+func (c *Collector) DeclareDCEDep(o types.Object, tArgs ...types.Type) {
+	if c.dce != nil {
+		c.dce.addDep(o, tArgs)
 	}
-	c.dependencies[o] = struct{}{}
 }