Changeset d5916ce for src

Timestamp:

Aug 28, 2018, 6:27:21 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b54ad9c

Parents:

e5ea867

Message:

Fix *? discovery in FindSpecialDeclarations?

File:

• src/SymTab/Validate.cc (modified) (1 diff)

src/SymTab/Validate.cc

@@ -1333 +1333 @@
         void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
                 if ( ! dereferenceOperator ) {
-                        if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) {
-                                FunctionType * ftype = funcDecl->get_functionType();
-                                if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) {
-                                        dereferenceOperator = funcDecl;
+                        // find and remember the intrinsic dereference operator for object pointers
+                        if ( funcDecl->name == "*?" && funcDecl->linkage == LinkageSpec::Intrinsic ) {
+                                FunctionType * ftype = funcDecl->type;
+                                if ( ftype->parameters.size() == 1 ) {
+                                        PointerType * ptrType = strict_dynamic_cast<PointerType *>( ftype->parameters.front()->get_type() );
+                                        if ( ptrType->base->get_qualifiers() == Type::Qualifiers() ) {
+                                                TypeInstType * inst = dynamic_cast<TypeInstType *>( ptrType->base );
+                                                if ( inst && ! inst->get_isFtype() ) {
+                                                        dereferenceOperator = funcDecl;
+                                                }
+                                        }
                                 }
                         }