From 34ae84c5698d0f5a3eeb3e04347a16e5481d5c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 9 Sep 2024 15:54:41 +0100
Subject: [PATCH] internal/astinternal: use reflect.Value.IsNil consistently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code was using a mix of IsValid and IsNil checks on reflect.Value;
use IsNil consistently. This is a few more lines of code, but it's
also more obvious. While here, make the comments a bit clearer.

Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
Change-Id: I8fcd0f2cb43e9861807a4eccd78de4e66f6a419b
Dispatch-Trailer: {"type":"trybot","CL":1200889,"patchset":2,"ref":"refs/changes/89/1200889/2","targetBranch":"master"}
---
 internal/astinternal/debug.go | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/internal/astinternal/debug.go b/internal/astinternal/debug.go
index 84992a3ef..51c12c2b6 100644
--- a/internal/astinternal/debug.go
+++ b/internal/astinternal/debug.go
@@ -71,24 +71,26 @@ func (d *debugPrinter) value0(v reflect.Value, impliedType reflect.Type) {
 	if d.cfg.Filter != nil && !d.cfg.Filter(v) {
 		return
 	}
-	// Skip over interface types.
-	if v.Kind() == reflect.Interface {
+	// Skip over interfaces and pointers, stopping early if nil.
+	concreteType := v.Type()
+	for {
+		k := v.Kind()
+		if k != reflect.Interface && k != reflect.Pointer {
+			break
+		}
+		if v.IsNil() {
+			if !d.cfg.OmitEmpty {
+				d.printf("nil")
+			}
+			return
+		}
 		v = v.Elem()
-	}
-	// Indirecting a nil interface gives a zero value. We
-	// can also have a nil pointer inside a non-nil interface.
-	if !v.IsValid() || (v.Kind() == reflect.Pointer && v.IsNil()) {
-		if !d.cfg.OmitEmpty {
-			d.printf("nil")
+		if k == reflect.Interface {
+			// For example, *ast.Ident can be the concrete type behind an ast.Expr.
+			concreteType = v.Type()
 		}
-		return
 	}
 
-	// We print the original pointer type if there was one.
-	origType := v.Type()
-
-	v = reflect.Indirect(v)
-
 	if d.cfg.OmitEmpty && v.IsZero() {
 		return
 	}
@@ -121,8 +123,9 @@ func (d *debugPrinter) value0(v reflect.Value, impliedType reflect.Type) {
 
 	case reflect.Slice, reflect.Struct:
 		valueStart := d.pos()
-		if origType != impliedType {
-			d.printf("%s", origType)
+		// We print the concrete type when it differs from an implied type.
+		if concreteType != impliedType {
+			d.printf("%s", concreteType)
 		}
 		d.printf("{")
 		d.level++