From 37db6b290ccde485512db7f313d0851ef9d2611e Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Wed, 18 Jan 2017 20:19:21 -0800
Subject: [PATCH] Bug 510662 - NPE in BuiltinOperators.<init>

Change-Id: I1ed5c8d0e820a89fb52c4ae51bc2f2ab79ce37b3
---
 .../eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
index f208413b7e0..700d5e44b89 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
@@ -231,7 +231,8 @@ public class CPPVariable extends PlatformObject implements ICPPInternalVariable
 				return null;
 			}
 			if (!initEval.isValueDependent() ) {
-				return initEval.getValue(fDefinition);
+				IASTNode point = fDefinition != null ? fDefinition : fDeclarations[0];
+				return initEval.getValue(point);
 			}
 			return DependentValue.create(initEval);
 		}