From a7db062b48151bf2b6e40c42c8aab1621c2144ff Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Jun 2026 10:35:26 -0400 Subject: [PATCH] ctf: Support CTF2 empty structs Signed-off-by: Arnaud Fiorini --- .../ctf/core/event/metadata/tsdl/struct/StructParser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java index ef136c6799..6dae9720b5 100644 --- a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java +++ b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java @@ -22,6 +22,7 @@ import org.eclipse.tracecompass.ctf.parser.CTFParser; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.AbstractScopedCommonTreeParser; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFAntlrMetadataNode; +import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFJsonMetadataNode; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMemberMetadataNode; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMetadataNode; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException; @@ -281,6 +282,9 @@ public StructDeclaration parse(ICTFMetadataNode struct, ICommonTreeParserParamet throw new ParseException("struct " + structName //$NON-NLS-1$ + " is not defined"); //$NON-NLS-1$ } + } else if (struct instanceof CTFJsonMetadataNode) { + /* In CTF2, empty structs should be supported */ + structDeclaration = new StructDeclaration(structAlign); } else { /* !Name and !body */