From ad308251da1de7cbb3c48a52ba0d11d4d06544d2 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sat, 7 Mar 2015 23:58:05 -0800
Subject: [PATCH] Code streamlining.

---
 .../cdt/codan/core/cxx/CxxAstUtils.java       | 22 +++----------------
 .../org.eclipse.cdt.core/META-INF/MANIFEST.MF |  2 +-
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
index c55acdea6a7..e3edb4db8a3 100644
--- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
+++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtils.java
@@ -48,7 +48,6 @@ import org.eclipse.cdt.core.dom.ast.IFunction;
 import org.eclipse.cdt.core.dom.ast.INodeFactory;
 import org.eclipse.cdt.core.dom.ast.IProblemBinding;
 import org.eclipse.cdt.core.dom.ast.IType;
-import org.eclipse.cdt.core.dom.ast.ITypedef;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
 import org.eclipse.cdt.core.dom.rewrite.DeclarationGenerator;
 import org.eclipse.cdt.core.index.IIndex;
@@ -56,6 +55,7 @@ import org.eclipse.cdt.core.index.IIndexFile;
 import org.eclipse.cdt.core.index.IIndexName;
 import org.eclipse.cdt.core.model.CoreModelUtil;
 import org.eclipse.cdt.core.model.ITranslationUnit;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
 import org.eclipse.core.runtime.CoreException;
 
 /**
@@ -82,7 +82,7 @@ public final class CxxAstUtils {
 		
 		@Override
 		public int visit(IASTExpression expression) {
-			if(expression instanceof IASTFieldReference) {
+			if (expression instanceof IASTFieldReference) {
 				this.name = ((IASTFieldReference) expression).getFieldName();
 				return PROCESS_ABORT;
 			}
@@ -95,23 +95,7 @@ public final class CxxAstUtils {
 	}
 
 	public static IType unwindTypedef(IType type) {
-		if (!(type instanceof IBinding))
-			return type;
-		IBinding typeName = (IBinding) type;
-		// unwind typedef chain
-		try {
-			while (typeName instanceof ITypedef) {
-				IType t = ((ITypedef) typeName).getType();
-				if (t instanceof IBinding) {
-					typeName = (IBinding) t;
-				} else {
-					return t;
-				}
-			}
-		} catch (Exception e) { // in CDT 6.0 getType throws DOMException
-			Activator.log(e);
-		}
-		return (IType) typeName;
+		return SemanticUtil.getNestedType(type, SemanticUtil.TDEF);
 	}
 
 	public static boolean isInMacro(IASTNode node) {
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 958ca445c2a..5ad9605c088 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -58,7 +58,7 @@ Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.internal.core.dom.parser;x-friends:="org.eclipse.cdt.ui,org.eclipse.cdt.codan.checkers",
  org.eclipse.cdt.internal.core.dom.parser.c;x-friends:="org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.core.dom.parser.cpp;x-friends:="org.eclipse.cdt.ui",
- org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;x-friends:="org.eclipse.cdt.ui",
+ org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;x-friends:="org.eclipse.cdt.ui,org.eclipse.cdt.codan.core.cxx",
  org.eclipse.cdt.internal.core.dom.rewrite;x-friends:="org.eclipse.cdt.core.tests,org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.core.dom.rewrite.astwriter;x-friends:="org.eclipse.cdt.ui",
  org.eclipse.cdt.internal.core.dom.rewrite.changegenerator;x-internal:=true,