From e8cf0cdce945b8c0217c636002c0979ba31a0a8b Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Sat, 7 Sep 2013 02:51:25 -0400 Subject: [PATCH] Bug 414279 - Fix an NPE Change-Id: Ib2ec70e74bc56364dbaf3756162626683eba70e1 Signed-off-by: Nathan Ridge Reviewed-on: https://git.eclipse.org/r/16201 Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.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/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 57a23396f58..5230be61a46 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -855,7 +855,8 @@ public class CPPVisitor extends ASTQueries { if (function.getOwner() instanceof ICPPClassType) { // Don't consider a function brought into scope from a base class scope // to be the same as a function declared in a derived class scope. - if (!((ICPPClassType) function.getOwner()).getCompositeScope().equals(scope)) { + IScope bindingScope = ((ICPPClassType) function.getOwner()).getCompositeScope(); + if (bindingScope == null || !bindingScope.equals(scope)) { sameFunction = false; } }