[PATCH v1 3/4] xdrgen: Register optional-data names only for typedefs

[Chuck Lever <cel@kernel.org>]

_XdrOptionalData adds its name to structs and to pass_by_reference
when it is constructed, and that name is the field name when the
declaration is a member of a struct or a union. Both sets are
otherwise keyed by type name: _XdrDefinedType consults structs to
emit a "struct" classifier, and the encoder templates consult
pass_by_reference to pass an argument by address. A field named
after a scalar typedef turns every later reference to that typedef
into a struct passed by reference, and the generated C does not
compile. No in-tree .x file declares such a field, so the generated
headers do not change.

Add the name only when the optional-data declaration is a typedef,
beside the width registration in _XdrTypedef.

Signed-off-by: Chuck Lever <cel@kernel.org>
---
 tools/net/sunrpc/xdrgen/xdr_ast.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/net/sunrpc/xdrgen/xdr_ast.py b/tools/net/sunrpc/xdrgen/xdr_ast.py
index a3595aa40a57..6b012f0f7a42 100644
--- a/tools/net/sunrpc/xdrgen/xdr_ast.py
+++ b/tools/net/sunrpc/xdrgen/xdr_ast.py
@@ -284,10 +284,6 @@ class _XdrOptionalData(_XdrDeclaration):
         """Return list containing XDR width of type's components"""
         return ["XDR_bool"]
 
-    def __post_init__(self):
-        structs.add(self.name)
-        pass_by_reference.add(self.name)
-
 
 @dataclass
 class _XdrBasic(_XdrDeclaration):
@@ -440,6 +436,9 @@ class _XdrTypedef(_XdrAst):
     def __post_init__(self):
         if isinstance(self.declaration, (_XdrVariableLengthOpaque, _XdrString)):
             varlen_object_typedefs[self.declaration.name] = self.declaration.maxsize
+        if isinstance(self.declaration, _XdrOptionalData):
+            structs.add(self.declaration.name)
+            pass_by_reference.add(self.declaration.name)
         if isinstance(self.declaration, _XdrBasic):
             new_type = self.declaration
             if isinstance(new_type.spec, _XdrDefinedType):
-- 
2.56.0