Changeset 04e6f93 for src/SymTab/Validate.cc

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (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

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -311 +311 @@
                         Stats::Heap::newPass("validate-A");
                         Stats::Time::BlockGuard guard("validate-A");
+                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                         acceptAll( translationUnit, hoistDecls );
                         ReplaceTypedef::replaceTypedef( translationUnit );
@@ -336 +337 @@
                         Stats::Time::BlockGuard guard("validate-C");
                         acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes_old
-                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                         ReturnChecker::checkFunctionReturns( translationUnit );
                         InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
@@ -1182 +1182 @@
                 if ( CodeGen::isCtorDtorAssign( funcDecl->get_name() ) ) { // TODO: also check /=, etc.
                         if ( params.size() == 0 ) {
-                                SemanticError( funcDecl, "Constructors, destructors, and assignment functions require at least one parameter " );
+                                SemanticError( funcDecl->location, "Constructors, destructors, and assignment functions require at least one parameter." );
                         }
                         ReferenceType * refType = dynamic_cast< ReferenceType * >( params.front()->get_type() );
                         if ( ! refType ) {
-                                SemanticError( funcDecl, "First parameter of a constructor, destructor, or assignment function must be a reference " );
+                                SemanticError( funcDecl->location, "First parameter of a constructor, destructor, or assignment function must be a reference." );
                         }
                         if ( CodeGen::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) {
-                                SemanticError( funcDecl, "Constructors and destructors cannot have explicit return values " );
+                                if(!returnVals.front()->get_type()->isVoid()) {
+                                        SemanticError( funcDecl->location, "Constructors and destructors cannot have explicit return values." );
+                                }
                         }
                 }