ctf: fix bug of identifier being incorrect in declarationscope

MatthewKhouzam · MatthewKhouzam · commit 9be58bd000d3 · 2025-12-11T22:25:43.000-05:00
Found with CodeRabbit.

Change-Id: Ifa4be68a71fc98e6ca4604c290d50d6840746451
Signed-off-by: Matthew Khouzam &lt;matthew.khouzam@ericsson.com&gt;
diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/metadata/DeclarationScope.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/metadata/DeclarationScope.java
@@ -197,11 +197,10 @@ public void registerType(String name, IDeclaration declaration)
      */
     public void registerIdentifier(String name, IDeclaration declaration) throws ParseException {
         /* Check if the type has been defined in the current scope */
-        IDeclaration iDeclaration = fIdentifiers.get(declaration);
+        IDeclaration iDeclaration = fIdentifiers.get(name);
         if (iDeclaration != null && !Objects.equals(iDeclaration, declaration)) {
             throw new ParseException("Identifier has already been defined:" + name); //$NON-NLS-1$
         }
-
         /* Add it to the register. */
         fIdentifiers.put(name, declaration);
     }

Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,10 @@ public void registerType(String name, IDeclaration declaration)`
`197`	`197`	`*/`
`198`	`198`	`public void registerIdentifier(String name, IDeclaration declaration) throws ParseException {`
`199`	`199`	`/* Check if the type has been defined in the current scope */`
`200`		`- IDeclaration iDeclaration = fIdentifiers.get(declaration);`
	`200`	`+ IDeclaration iDeclaration = fIdentifiers.get(name);`
`201`	`201`	`if (iDeclaration != null && !Objects.equals(iDeclaration, declaration)) {`
`202`	`202`	`throw new ParseException("Identifier has already been defined:" + name); //$NON-NLS-1$`
`203`	`203`	`}`
`204`		`-`
`205`	`204`	`/* Add it to the register. */`
`206`	`205`	`fIdentifiers.put(name, declaration);`
`207`	`206`	`}`