From 9e4c36a7ab1abdad4651d2687d5881103b3a9419 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 23 May 2019 21:00:15 -0400 Subject: [PATCH] Bug 547533 - Avoid ClassCastException in EvalTypeId.getValue() Change-Id: I614b67a7b53b7075b702911a33ba8440a187614e --- .../cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java index 1abb5425a0a..85bd7612c16 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java @@ -158,7 +158,7 @@ public class EvalTypeId extends CPPDependentEvaluation { return CompositeValue.create(classType); } else if (ctor == AGGREGATE_INITIALIZATION) { return CompositeValue.create(new EvalInitList(fArguments, getTemplateDefinition()), classType); - } else if (ctor != null) { + } else if (ctor instanceof ICPPConstructor) { EvalConstructor evalCtor = new EvalConstructor(classType, (ICPPConstructor) ctor, fArguments, getTemplateDefinition()); ICPPEvaluation computedEvalCtor = evalCtor.computeForFunctionCall(new ActivationRecord(),