Changeset 2bfc6b2 for src/SymTab

Timestamp:

Aug 30, 2018, 1:00:41 PM (7 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:

bcc0946

Parents:

a715b5c

Message:

Refactor FindSpecialDeclarations? and associated special declarations

Location:

src/SymTab

Files:

• Autogen.cc (modified) (1 diff)
• Autogen.h (modified) (1 diff)
• Validate.cc (modified) (7 diffs)

src/SymTab/Autogen.cc ¶

@@ -41 +41 @@
 
 namespace SymTab {
-        Type * SizeType = 0;
-
         /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype
         struct FuncData {

src/SymTab/Autogen.h ¶

@@ -36 +36 @@
         /// returns true if obj's name is the empty string and it has a bitfield width
         bool isUnnamedBitfield( ObjectDecl * obj );
-
-        /// size_t type - set when size_t typedef is seen. Useful in a few places,
-        /// such as in determining array dimension type
-        extern Type * SizeType;
-
-        /// intrinsic dereference operator for unqualified types - set when *? function is seen in FindSpecialDeclarations.
-        /// Useful for creating dereference ApplicationExprs without a full resolver pass.
-        extern FunctionDecl * dereferenceOperator;
 
         /// generate the type of an assignment function for paramType.

src/SymTab/Validate.cc ¶

@@ -75 +75 @@
 #include "SynTree/Visitor.h"           // for Visitor
 #include "Validate/HandleAttributes.h" // for handleAttributes
+#include "Validate/FindSpecialDecls.h" // for FindSpecialDecls
 
 class CompoundStmt;
@@ -287 +288 @@
         };
 
-        FunctionDecl * dereferenceOperator = nullptr;
-        struct FindSpecialDeclarations final {
-                void previsit( FunctionDecl * funcDecl );
-        };
-
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 PassVisitor<EnumAndPointerDecay> epc;
@@ -298 +294 @@
                 PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
-                PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
                 PassVisitor<HoistTypeDecls> hoistDecls;
@@ -325 +320 @@
                 FixObjectType::fix( translationUnit );
                 ArrayLength::computeLength( translationUnit );
-                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                Validate::findSpecialDecls( translationUnit );
                 mutateAll( translationUnit, labelAddrFixer );
                 Validate::handleAttributes( translationUnit );
@@ -901 +896 @@
                 if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
-                        SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
+                        Validate::SizeType = eliminator.pass.typedefNames["size_t"].first->base->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
                         // eventually should have a warning for this case.
-                        SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                        Validate::SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
         }
@@ -1293 +1288 @@
                         // need to resolve array dimensions early so that constructor code can correctly determine
                         // if a type is a VLA (and hence whether its elements need to be constructed)
-                        ResolvExpr::findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+                        ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
 
                         // must re-evaluate whether a type is a VLA, now that more information is available
@@ -1330 +1325 @@
                 return addrExpr;
         }
-
-        void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
-                if ( ! dereferenceOperator ) {
-                        // 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;
-                                                }
-                                        }
-                                }
-                        }
-                }
-        }
 } // namespace SymTab