mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

NPE in type-comparison, bug 238614.

Browse source
This commit is contained in:
Markus Schorn 2008-07-09 09:52:30 +00:00
parent eba71c1297
commit 51c06fe8cc
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCBugsTest.java
View file

@ -94,7 +94,7 @@ public class PDOMCBugsTest extends BaseTestCase {
IFunctionType ft= (IFunctionType) type; IFunctionType ft= (IFunctionType) type;
assertEquals("int (int)", ASTTypeUtil.getType(ft)); assertEquals("int (int)", ASTTypeUtil.getType(ft));
} else { } else {
assertNull("expected null, got "+type, type); assertTrue("expected ITypedef, got "+type, type == null || type instanceof ITypedef);
} }
} }

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
View file

@ -1771,7 +1771,9 @@ public class CPPVisitor {
ICPPClassScope cScope = (ICPPClassScope) s; ICPPClassScope cScope = (ICPPClassScope) s;
IType type = cScope.getClassType(); IType type = cScope.getClassType();
if (type instanceof ICPPClassTemplate) { if (type instanceof ICPPClassTemplate) {
type = (IType) CPPTemplates.instantiateWithinClassTemplate((ICPPClassTemplate) type); IBinding within = CPPTemplates.instantiateWithinClassTemplate((ICPPClassTemplate) type);
if (within instanceof ICPPClassType)
type = (ICPPClassType)within;
} }
if (dtor.isConst() || dtor.isVolatile()) if (dtor.isConst() || dtor.isVolatile())
type = new CPPQualifierType(type, dtor.isConst(), dtor.isVolatile()); type = new CPPQualifierType(type, dtor.isConst(), dtor.isVolatile());

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SemanticUtil.java
View file

@ -169,7 +169,10 @@ public class SemanticUtil {
try { try {
while( true ){ while( true ){
if( type instanceof ITypedef ) { if( type instanceof ITypedef ) {
type= ((ITypedef)type).getType(); IType tt= ((ITypedef)type).getType();
if (tt == null)
return type;
type= tt;
} else if( type instanceof IQualifierType ) { } else if( type instanceof IQualifierType ) {
type= ((IQualifierType)type).getType(); type= ((IQualifierType)type).getType();
} else if( stopAtPointerToMember && type instanceof ICPPPointerToMemberType ) } else if( stopAtPointerToMember && type instanceof ICPPPointerToMemberType )
@ -200,7 +203,10 @@ public class SemanticUtil {
try { try {
while( true ){ while( true ){
if( type instanceof ITypedef ) { if( type instanceof ITypedef ) {
type = ((ITypedef)type).getType(); IType tt= ((ITypedef)type).getType();
if (tt == null)
return type;
type= tt;
} else if( type instanceof IQualifierType ) { } else if( type instanceof IQualifierType ) {
type = ((IQualifierType)type).getType(); type = ((IQualifierType)type).getType();
} else if( type instanceof ICPPReferenceType ) { } else if( type instanceof ICPPReferenceType ) {