Changeset b13fc10

Timestamp:

May 3, 2017, 3:15:09 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9643b31

Parents:

1ed841f (diff), dba6db9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeTools/TrackLoc.cc (added)
• CodeTools/TrackLoc.h (added)
• CodeTools/module.mk (modified) (1 diff)
• GenPoly/InstantiateGeneric.cc (modified) (3 diffs)
• Makefile.in (modified) (6 diffs)
• Parser/parser.yy (modified) (3 diffs)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/PointerType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (1 diff)
• SynTree/Visitor.h (modified) (2 diffs)

src/CodeTools/module.mk ¶

@@ -15 +15 @@
 ###############################################################################
 
-SRC += CodeTools/DeclStats.cc
+SRC += CodeTools/DeclStats.cc \
+        CodeTools/TrackLoc.cc

src/GenPoly/InstantiateGeneric.cc ¶

@@ -233 +233 @@
                                 } else {
                                         // normalize possibly dtype-static parameter type
-                                        out.push_back( new TypeExpr{ 
+                                        out.push_back( new TypeExpr{
                                                 ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
                                         gt |= genericType::concrete;
@@ -369 +369 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -423 +424 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/Makefile.in ¶

@@ -108 +108 @@
         CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT) \
         CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT) \
+        CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT) \
         Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT) \
         Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \
@@ -388 +389 @@
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc CodeTools/DeclStats.cc \
-        Concurrency/Keywords.cc Common/SemanticError.cc \
-        Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
+        CodeTools/TrackLoc.cc Concurrency/Keywords.cc \
+        Common/SemanticError.cc Common/UniqueName.cc \
+        Common/DebugMalloc.cc Common/Assert.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
@@ -545 +547 @@
         @: > CodeTools/$(DEPDIR)/$(am__dirstamp)
 CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT):  \
+        CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT):  \
         CodeTools/$(am__dirstamp) CodeTools/$(DEPDIR)/$(am__dirstamp)
 Concurrency/$(am__dirstamp):
@@ -843 +847 @@
         -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT)
         -rm -f CodeTools/driver_cfa_cpp-DeclStats.$(OBJEXT)
+        -rm -f CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-Assert.$(OBJEXT)
         -rm -f Common/driver_cfa_cpp-DebugMalloc.$(OBJEXT)
@@ -954 +959 @@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/driver_cfa_cpp-OperatorTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-DeclStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-DebugMalloc.Po@am__quote@
@@ -1195 +1201 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-DeclStats.obj `if test -f 'CodeTools/DeclStats.cc'; then $(CYGPATH_W) 'CodeTools/DeclStats.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/DeclStats.cc'; fi`
 
+CodeTools/driver_cfa_cpp-TrackLoc.o: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.o -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-TrackLoc.o `test -f 'CodeTools/TrackLoc.cc' || echo '$(srcdir)/'`CodeTools/TrackLoc.cc
+
+CodeTools/driver_cfa_cpp-TrackLoc.obj: CodeTools/TrackLoc.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT CodeTools/driver_cfa_cpp-TrackLoc.obj -MD -MP -MF CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo -c -o CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Tpo CodeTools/$(DEPDIR)/driver_cfa_cpp-TrackLoc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='CodeTools/TrackLoc.cc' object='CodeTools/driver_cfa_cpp-TrackLoc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o CodeTools/driver_cfa_cpp-TrackLoc.obj `if test -f 'CodeTools/TrackLoc.cc'; then $(CYGPATH_W) 'CodeTools/TrackLoc.cc'; else $(CYGPATH_W) '$(srcdir)/CodeTools/TrackLoc.cc'; fi`
+
 Concurrency/driver_cfa_cpp-Keywords.o: Concurrency/Keywords.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Keywords.o -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Tpo -c -o Concurrency/driver_cfa_cpp-Keywords.o `test -f 'Concurrency/Keywords.cc' || echo '$(srcdir)/'`Concurrency/Keywords.cc

src/Parser/parser.yy ¶

@@ -393 +393 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+        | primary_expression '{' argument_expression_list '}' // CFA
+                {
+                        Token fn;
+                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
+                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                }
         ;
 
@@ -425 +431 @@
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
-        | postfix_expression '{' argument_expression_list '}' // CFA
+        | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
-                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                        fn.str = new string( "^?{}" );                          // location undefined
+                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) );
                 }
         ;
@@ -730 +736 @@
         | exception_statement
         | asm_statement
-        | '^' postfix_expression '{' argument_expression_list '}' ';' // CFA
-                {
-                        Token fn;
-                        fn.str = new string( "^?{}" );                          // location undefined
-                        $$ = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) ) ) );
-                }
-        ;
 
 labeled_statement:

src/SymTab/Validate.cc ¶

@@ -240 +240 @@
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
+                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                 Concurrency::applyKeywords( translationUnit );
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
-                acceptAll( translationUnit, epc );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, pass3 );
-                VerifyCtorDtorAssign::verify( translationUnit );
                 ArrayLength::computeLength( translationUnit );
         }
@@ -817 +817 @@
                                 throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl );
                         }
-                        if ( ! dynamic_cast< PointerType * >( params.front()->get_type() ) ) {
+                        PointerType * ptrType = dynamic_cast< PointerType * >( params.front()->get_type() );
+                        if ( ! ptrType || ptrType->is_array() ) {
                                 throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a pointer ", funcDecl );
                         }

src/SynTree/PointerType.cc ¶

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PointerType.cc -- 
+// PointerType.cc --
 //
 // Author           : Richard C. Bilson
@@ -38 +38 @@
 void PointerType::print( std::ostream &os, int indent ) const {
         Type::print( os, indent );
-        os << "pointer to ";
-        if ( isStatic ) {
-                os << "static ";
-        } // if
-        if ( isVarLen ) {
-                os << "variable length array of ";
-        } else if ( dimension ) {
-                os << "array of ";
-                dimension->print( os, indent );
-        } // if
+        if ( ! is_array() ) {
+                os << "pointer to ";
+        } else {
+                os << "decayed ";
+                if ( isStatic ) {
+                        os << "static ";
+                } // if
+                if ( isVarLen ) {
+                        os << "variable length array of ";
+                } else if ( dimension ) {
+                        os << "array of ";
+                        dimension->print( os, indent );
+                        os << " ";
+                } // if
+        }
         if ( base ) {
                 base->print( os, indent );

src/SynTree/Type.h ¶

@@ -247 +247 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
+        bool is_array() const { return isStatic || isVarLen || dimension; }
+
         virtual PointerType *clone() const { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }

src/SynTree/Visitor.h ¶

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:23:24 2017
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  3 08:58:00 2017
 // Update Count     : 10
 //
@@ -26 +26 @@
         virtual ~Visitor();
   public:
+        // visit: Default implementation of all functions visits the children
+    // of the given syntax node, but performs no other action.
+
         virtual void visit( ObjectDecl *objectDecl );
         virtual void visit( FunctionDecl *functionDecl );