Changeset 2bfc6b2

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

Files:

• GenPoly/Lvalue.cc (modified) (3 diffs)
• InitTweak/FixInit.cc (modified) (8 diffs)
• InitTweak/GenInit.cc (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (7 diffs)
• ResolvExpr/Resolver.cc (modified) (3 diffs)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Autogen.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (7 diffs)
• Validate/FindSpecialDecls.cc (added)
• Validate/FindSpecialDecls.h (added)
• Validate/module.mk (modified) (1 diff)

src/GenPoly/Lvalue.cc ¶

@@ -21 +21 @@
 #include "Lvalue.h"
 
+#include "InitTweak/InitTweak.h"
 #include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
-#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
@@ -33 +33 @@
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
+#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 
 #if 0
@@ -44 +45 @@
                 // TODO: fold this into the general createDeref function??
                 Expression * mkDeref( Expression * arg ) {
-                        if ( SymTab::dereferenceOperator ) {
+                        if ( Validate::dereferenceOperator ) {
                                 // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-                                VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
+                                VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
                                 Type * base = InitTweak::getPointerBase( arg->result );

src/InitTweak/FixInit.cc ¶

@@ -56 +56 @@
 #include "SynTree/DeclReplacer.h"      // for DeclReplacer
 #include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 
 bool ctordtorp = false; // print all debug
@@ -204 +205 @@
                         static void generate( std::list< Declaration * > & translationUnit );
 
-                        void premutate( StructDecl * structDecl );
-
                         void premutate( FunctionDecl * funcDecl );
                         DeclarationWithType * postmutate( FunctionDecl * funcDecl );
@@ -227 +226 @@
                         bool isCtor = false; // true if current function is a constructor
                         StructDecl * structDecl = nullptr;
-
-                        // special built-in functions necessary for this to work
-                        StructDecl * dtorStruct = nullptr;
-                        FunctionDecl * dtorStructDestroy = nullptr;
                 };
 
@@ -1019 +1014 @@
                 }
 
-                void GenStructMemberCalls::premutate( StructDecl * structDecl ) {
-                        if ( ! dtorStruct && structDecl->name == "__Destructor" ) {
-                                dtorStruct = structDecl;
-                        }
-                }
-
                 void GenStructMemberCalls::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( function );
@@ -1037 +1026 @@
                         unhandled.clear();
                         usedUninit.clear();
-
-                        if ( ! dtorStructDestroy && funcDecl->name == "__destroy_Destructor" ) {
-                                dtorStructDestroy = funcDecl;
-                                return;
-                        }
 
                         function = funcDecl;
@@ -1053 +1037 @@
                                 if ( structType ) {
                                         structDecl = structType->get_baseStruct();
-                                        if ( structDecl == dtorStruct ) return;
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -1127 +1110 @@
                                                                 // function->get_statements()->push_back( callStmt );
 
+                                                                // Optimization: do not need to call intrinsic destructors on members
+                                                                if ( isIntrinsicSingleArgCallStmt( callStmt ) ) continue;;
+
                                                                 // __Destructor _dtor0 = { (void *)&b.a1, (void (*)(void *)_destroy_A };
                                                                 std::list< Statement * > stmtsToAdd;
 
                                                                 static UniqueName memberDtorNamer = { "__memberDtor" };
-                                                                assertf( dtorStruct, "builtin __Destructor not found." );
-                                                                assertf( dtorStructDestroy, "builtin __destroy_Destructor not found." );
+                                                                assertf( Validate::dtorStruct, "builtin __Destructor not found." );
+                                                                assertf( Validate::dtorStructDestroy, "builtin __destroy_Destructor not found." );
 
                                                                 Expression * thisExpr = new CastExpr( new AddressExpr( new VariableExpr( thisParam ) ), new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ) );
@@ -1142 +1128 @@
                                                                 Type * dtorType = new PointerType( Type::Qualifiers(), dtorFtype );
 
-                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) );
+                                                                ObjectDecl * destructor = ObjectDecl::newObject( memberDtorNamer.newName(), new StructInstType( Type::Qualifiers(), Validate::dtorStruct ), new ListInit( { new SingleInit( thisExpr ), new SingleInit( new CastExpr( dtorExpr, dtorType ) ) } ) );
                                                                 function->statements->push_front( new DeclStmt( destructor ) );
-                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( dtorStructDestroy ) } ) );
+                                                                destructor->attributes.push_back( new Attribute( "cleanup", { new VariableExpr( Validate::dtorStructDestroy ) } ) );
 
                                                                 function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd );

src/InitTweak/GenInit.cc ¶

@@ -15 +15 @@
 #include "GenInit.h"
 
-#include <stddef.h>                // for NULL
-#include <algorithm>               // for any_of
-#include <cassert>                 // for assert, strict_dynamic_cast, assertf
-#include <iterator>                // for back_inserter, inserter, back_inse...
-#include <list>                    // for _List_iterator, list
+#include <stddef.h>                    // for NULL
+#include <algorithm>                   // for any_of
+#include <cassert>                     // for assert, strict_dynamic_cast, assertf
+#include <iterator>                    // for back_inserter, inserter, back_inse...
+#include <list>                        // for _List_iterator, list
 
 #include "CodeGen/OperatorTable.h"
-#include "Common/PassVisitor.h"    // for PassVisitor, WithGuards, WithShort...
-#include "Common/SemanticError.h"  // for SemanticError
-#include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for ValueGuard, maybeClone
-#include "GenPoly/GenPoly.h"       // for getFunctionType, isPolyType
-#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::const_iter...
-#include "InitTweak.h"             // for isConstExpr, InitExpander, checkIn...
-#include "Parser/LinkageSpec.h"    // for isOverridable, C
+#include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for ValueGuard, maybeClone
+#include "GenPoly/GenPoly.h"           // for getFunctionType, isPolyType
+#include "GenPoly/ScopedSet.h"         // for ScopedSet, ScopedSet<>::const_iter...
+#include "InitTweak.h"                 // for isConstExpr, InitExpander, checkIn...
+#include "Parser/LinkageSpec.h"        // for isOverridable, C
 #include "ResolvExpr/Resolver.h"
-#include "SymTab/Autogen.h"        // for genImplicitCall, SizeType
-#include "SymTab/Mangler.h"        // for Mangler
-#include "SynTree/Declaration.h"   // for ObjectDecl, DeclarationWithType
-#include "SynTree/Expression.h"    // for VariableExpr, UntypedExpr, Address...
-#include "SynTree/Initializer.h"   // for ConstructorInit, SingleInit, Initi...
-#include "SynTree/Label.h"         // for Label
-#include "SynTree/Mutator.h"       // for mutateAll
-#include "SynTree/Statement.h"     // for CompoundStmt, ImplicitCtorDtorStmt
-#include "SynTree/Type.h"          // for Type, ArrayType, Type::Qualifiers
-#include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
-#include "Tuples/Tuples.h"         // for maybeImpure
+#include "SymTab/Autogen.h"            // for genImplicitCall
+#include "SymTab/Mangler.h"            // for Mangler
+#include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"        // for VariableExpr, UntypedExpr, Address...
+#include "SynTree/Initializer.h"       // for ConstructorInit, SingleInit, Initi...
+#include "SynTree/Label.h"             // for Label
+#include "SynTree/Mutator.h"           // for mutateAll
+#include "SynTree/Statement.h"         // for CompoundStmt, ImplicitCtorDtorStmt
+#include "SynTree/Type.h"              // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"             // for maybeImpure
+#include "Validate/FindSpecialDecls.h" // for SizeType
 
 namespace InitTweak {
@@ -186 +187 @@
 
                         // need to resolve array dimensions in order to accurately determine if constexpr
-                        ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
+                        ResolvExpr::findSingleExpression( arrayType->dimension, Validate::SizeType->clone(), indexer );
                         // array is variable-length when the dimension is not constexpr
                         arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
@@ -192 +193 @@
                         if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
+                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
                         arrayDimension->get_type()->set_const( true );
 

src/Makefile.am ¶

@@ -51 +51 @@
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
 
-demangler_SOURCES = SymTab/demangler.cc
+demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 
 demangler_LDADD = libdemangle.a     # yywrap
@@ -138 +138 @@
   Tuples/TupleAssignment.cc \
   Tuples/TupleExpansion.cc \
-  Validate/HandleAttributes.cc
+  Validate/HandleAttributes.cc \
+  Validate/FindSpecialDecls.cc
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in ¶

@@ -212 +212 @@
         Tuples/Explode.$(OBJEXT) Tuples/TupleAssignment.$(OBJEXT) \
         Tuples/TupleExpansion.$(OBJEXT) \
-        Validate/HandleAttributes.$(OBJEXT)
+        Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT)
 libdemangle_a_OBJECTS = $(am_libdemangle_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(cfa_cpplibdir)"
@@ -285 +286 @@
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
         Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT) \
         Virtual/ExpandCasts.$(OBJEXT)
 am____driver_cfa_cpp_OBJECTS = $(am__objects_1)
@@ -566 +568 @@
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
         Tuples/Explode.cc Validate/HandleAttributes.cc \
-        Virtual/ExpandCasts.cc
+        Validate/FindSpecialDecls.cc Virtual/ExpandCasts.cc
 MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
 MOSTLYCLEANFILES = Parser/parser.hh Parser/parser.output
@@ -580 +582 @@
 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
-demangler_SOURCES = SymTab/demangler.cc
+demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 demangler_LDADD = libdemangle.a     # yywrap
 noinst_LIBRARIES = libdemangle.a
@@ -665 +667 @@
   Tuples/TupleAssignment.cc \
   Tuples/TupleExpansion.cc \
-  Validate/HandleAttributes.cc
+  Validate/HandleAttributes.cc \
+  Validate/FindSpecialDecls.cc
 
 all: $(BUILT_SOURCES)
@@ -942 +945 @@
         @: > Validate/$(DEPDIR)/$(am__dirstamp)
 Validate/HandleAttributes.$(OBJEXT): Validate/$(am__dirstamp) \
+        Validate/$(DEPDIR)/$(am__dirstamp)
+Validate/FindSpecialDecls.$(OBJEXT): Validate/$(am__dirstamp) \
         Validate/$(DEPDIR)/$(am__dirstamp)
 
@@ -1203 +1208 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/FindSpecialDecls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/ExpandCasts.Po@am__quote@

src/ResolvExpr/Resolver.cc ¶

@@ -31 +31 @@
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 #include "Resolver.h"
-#include "SymTab/Autogen.h"              // for SizeType
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for ObjectDecl, TypeDecl, Declar...
@@ -43 +42 @@
 #include "typeops.h"                     // for extractResultType
 #include "Unify.h"                       // for unify
+#include "Validate/FindSpecialDecls.h"   // for SizeType
 
 using namespace std;
@@ -374 +374 @@
         void Resolver::handlePtrType( PtrType * type ) {
                 if ( type->get_dimension() ) {
-                        findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+                        findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
                 }
         }

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
 

src/Validate/module.mk ¶

@@ -15 +15 @@
 ###############################################################################
 
-SRC += Validate/HandleAttributes.cc
+SRC += Validate/HandleAttributes.cc \
+        Validate/FindSpecialDecls.cc