refactor: to check for IsDirectedNil only if ifacePtr == nil

goccy · Jul 3, 2022 · 884b8db · 884b8db
1 parent c8d6da8
commit 884b8db
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/internal/cmd/generator/vm.go.tmpl b/internal/cmd/generator/vm.go.tmpl
@@ -194,11 +194,13 @@ func Run(ctx *encoder.RuntimeContext, b []byte, codeSet *encoder.OpcodeSet) ([]b
 				ifacePtr = iface.ptr
 				typ = iface.typ
 			}
-			isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
-			if ifacePtr == nil && !isDirectedNil {
-				b = appendNullComma(ctx, b)
-				code = code.Next
-				break
+			if ifacePtr == nil {
+				isDirectedNil := typ != nil && typ.Kind() == reflect.Struct && !runtime.IfaceIndir(typ)
+				if !isDirectedNil {
+					b = appendNullComma(ctx, b)
+					code = code.Next
+					break
+				}
 			}
 			ctx.KeepRefs = append(ctx.KeepRefs, up)
 			ifaceCodeSet, err := encoder.CompileToGetCodeSet(ctx, uintptr(unsafe.Pointer(typ)))

diff --git a/internal/encoder/vm/vm.go b/internal/encoder/vm/vm.go
diff --git a/internal/encoder/vm_color/vm.go b/internal/encoder/vm_color/vm.go
diff --git a/internal/encoder/vm_color_indent/vm.go b/internal/encoder/vm_color_indent/vm.go
diff --git a/internal/encoder/vm_indent/vm.go b/internal/encoder/vm_indent/vm.go