also follow OCONVIFACE

Author: mateusz834

src/cmd/compile/internal/ir/expr.go

@@ -848,13 +848,7 @@ var Implements = func(t, iface *types.Type) bool {
 func StaticType(n Node) *types.Type {
 	out, typs := staticValue(n, true)
 
-	if out.Op() != OCONVIFACE {
-		return nil
-	}
-
-	recv := out.(*ConvExpr)
-
-	typ := recv.X.Type()
+	typ := out.Type()
 	if typ.IsInterface() {
 		return nil
 	}
@@ -903,6 +897,11 @@ func staticValue(n Node, forDevirt bool) (Node, []*types.Type) {
 				n = n1.X
 				continue
 			}
+			if forDevirt && n1.Op() == OCONVIFACE {
+				typeAssertTypes = append(typeAssertTypes, n1.Type())
+				n = n1.X
+				continue
+			}
 		case *InlinedCallExpr:
 			if n1.Op() == OINLCALL {
 				n = n1.SingleResult()

test/escape_iface_with_devirt_type_assertions.go

@@ -48,6 +48,14 @@ func t() {
 	a.(M).(A).(*Impl).A() // ERROR "inlining call"
 	a.(A).(M).(*Impl).M() // ERROR "inlining call"
 
+	any(a).(M).M()           // ERROR "devirtualizing" "inlining call"
+	any(a).(A).A()           // ERROR "devirtualizing" "inlining call"
+	any(a).(M).(any).(A).A() // ERROR "devirtualizing" "inlining call"
+
+	c := any(a)
+	c.(A).A() // ERROR "devirtualizing" "inlining call"
+	c.(M).M() // ERROR "devirtualizing" "inlining call"
+
 	{
 		var a C = &CImpl{}   // ERROR "does not escape"
 		a.(any).(C).C()      // ERROR "devirtualizing" "inlining"