From 8e80f515fa8f4a50f9f61f8ac6fe297646fc113f Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Fri, 8 Aug 2014 01:32:09 -0400 Subject: [PATCH] Bug 441394 - Fix an NPE in EvalFunctionSet.isConstantExpression() Change-Id: I1a4d887d064d8467e2e5e9371ab4ad0a93532089 Signed-off-by: Nathan Ridge Reviewed-on: https://git.eclipse.org/r/31247 Reviewed-by: Sergey Prigogin Tested-by: Sergey Prigogin --- .../internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java index d04aae645f7..16b19aa647e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java @@ -134,6 +134,8 @@ public class EvalFunctionSet extends CPPDependentEvaluation { @Override public boolean isConstantExpression(IASTNode point) { + if (fFunctionSet == null) + return false; for (ICPPFunction f : fFunctionSet.getBindings()) { if (!f.isConstexpr()) { return false;