Changeset 1a18423 for src/SymTab

Timestamp:

Jun 22, 2017, 9:43:02 AM (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:

7d9c987

Parents:

405c592 (diff), e9a3b20b (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/SymTab

Files:

• Autogen.h (modified) (2 diffs)
• Indexer.cc (modified) (1 diff)
• Indexer.h (modified) (1 diff)
• Validate.cc (modified) (17 diffs)

src/SymTab/Autogen.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:10:41 2017
-// Update Count     : 9
+// Last Modified On : Wed Jun 21 17:25:26 2017
+// Update Count     : 14
 //
 
@@ -25 +25 @@
 
 namespace SymTab {
-        /// Generates assignment operators, constructors, and destructor for aggregate types as required
-        void autogenerateRoutines( std::list< Declaration * > &translationUnit );
+    /// Generates assignment operators, constructors, and destructor for aggregate types as required
+    void autogenerateRoutines( std::list< Declaration * > &translationUnit );
 
-        /// returns true if obj's name is the empty string and it has a bitfield width
-        bool isUnnamedBitfield( ObjectDecl * obj );
+    /// 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;
+    /// 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;
 
-        /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
-        template< typename OutputIterator >
+    /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
+    template< typename OutputIterator >
         Statement * genCall( InitTweak::InitExpander & srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false, bool forward = true );
 
-        /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
-        /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
-        template< typename OutputIterator >
+    /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Should only be called with non-array types.
+    /// optionally returns a statement which must be inserted prior to the containing loop, if there is one
+    template< typename OutputIterator >
         Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false ) {
-                // want to be able to generate assignment, ctor, and dtor generically,
-                // so fname is either ?=?, ?{}, or ^?{}
-                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+        // want to be able to generate assignment, ctor, and dtor generically,
+        // so fname is either ?=?, ?{}, or ^?{}
+        UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
 
-                // do something special for unnamed members
-                dstParam = new AddressExpr( dstParam );
-                if ( addCast ) {
-                        // cast to T* with qualifiers removed, so that qualified objects can be constructed
-                        // and destructed with the same functions as non-qualified objects.
-                        // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
-                        // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
-                        // remove lvalue as a qualifier, this can change to
-                        //   type->get_qualifiers() = Type::Qualifiers();
-                        assert( type );
-                        Type * castType = type->clone();
+        // do something special for unnamed members
+        dstParam = new AddressExpr( dstParam );
+        if ( addCast ) {
+            // cast to T* with qualifiers removed, so that qualified objects can be constructed
+            // and destructed with the same functions as non-qualified objects.
+            // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+            // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+            // remove lvalue as a qualifier, this can change to
+            //   type->get_qualifiers() = Type::Qualifiers();
+            assert( type );
+            Type * castType = type->clone();
 //                      castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
-                        castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
-                        castType->set_lvalue( true ); // xxx - might not need this
-                        dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
-                }
-                fExpr->get_args().push_back( dstParam );
+            castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+            castType->set_lvalue( true ); // xxx - might not need this
+            dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
+        }
+        fExpr->get_args().push_back( dstParam );
 
-                Statement * listInit = srcParam.buildListInit( fExpr );
+        Statement * listInit = srcParam.buildListInit( fExpr );
 
-                std::list< Expression * > args = *++srcParam;
-                fExpr->get_args().splice( fExpr->get_args().end(), args );
+        std::list< Expression * > args = *++srcParam;
+        fExpr->get_args().splice( fExpr->get_args().end(), args );
 
-                *out++ = new ExprStmt( noLabels, fExpr );
+        *out++ = new ExprStmt( noLabels, fExpr );
 
-                srcParam.clearArrayIndices();
+        srcParam.clearArrayIndices();
 
-                return listInit;
+        return listInit;
+    }
+
+    /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
+    /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
+    template< typename OutputIterator >
+        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
+        static UniqueName indexName( "_index" );
+
+        // for a flexible array member nothing is done -- user must define own assignment
+        if ( ! array->get_dimension() ) return ;
+
+        Expression * begin, * end, * update, * cmp;
+        if ( forward ) {
+            // generate: for ( int i = 0; i < N; ++i )
+            begin = new ConstantExpr( Constant::from_int( 0 ) );
+            end = array->get_dimension()->clone();
+            cmp = new NameExpr( "?<?" );
+            update = new NameExpr( "++?" );
+        } else {
+            // generate: for ( int i = N-1; i >= 0; --i )
+            begin = new UntypedExpr( new NameExpr( "?-?" ) );
+            ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
+            ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant::from_int( 1 ) ) );
+            end = new ConstantExpr( Constant::from_int( 0 ) );
+            cmp = new NameExpr( "?>=?" );
+            update = new NameExpr( "--?" );
         }
 
-        /// Store in out a loop which calls fname on each element of the array with srcParam and dstParam as arguments.
-        /// If forward is true, loop goes from 0 to N-1, else N-1 to 0
-        template< typename OutputIterator >
-        void genArrayCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, ArrayType *array, bool addCast = false, bool forward = true ) {
-                static UniqueName indexName( "_index" );
+        ObjectDecl *index = new ObjectDecl( indexName.newName(), Type::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list<Expression*>() ) );
 
-                // for a flexible array member nothing is done -- user must define own assignment
-                if ( ! array->get_dimension() ) return ;
+        UntypedExpr *cond = new UntypedExpr( cmp );
+        cond->get_args().push_back( new VariableExpr( index ) );
+        cond->get_args().push_back( end );
 
-                Expression * begin, * end, * update, * cmp;
-                if ( forward ) {
-                        // generate: for ( int i = 0; i < 0; ++i )
-                        begin = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
-                        end = array->get_dimension()->clone();
-                        cmp = new NameExpr( "?<?" );
-                        update = new NameExpr( "++?" );
-                } else {
-                        // generate: for ( int i = N-1; i >= 0; --i )
-                        begin = new UntypedExpr( new NameExpr( "?-?" ) );
-                        ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
-                        ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant( new OneType( emptyQualifiers ), "1" ) ) );
-                        end = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
-                        cmp = new NameExpr( "?>=?" );
-                        update = new NameExpr( "--?" );
-                }
+        UntypedExpr *inc = new UntypedExpr( update );
+        inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
 
-                ObjectDecl *index = new ObjectDecl( indexName.newName(), Type::StorageClasses(), LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list<Expression*>() ) );
+        UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
+        dstIndex->get_args().push_back( dstParam );
+        dstIndex->get_args().push_back( new VariableExpr( index ) );
+        dstParam = dstIndex;
 
-                UntypedExpr *cond = new UntypedExpr( cmp );
-                cond->get_args().push_back( new VariableExpr( index ) );
-                cond->get_args().push_back( end );
+        // srcParam must keep track of the array indices to build the
+        // source parameter and/or array list initializer
+        srcParam.addArrayIndex( new VariableExpr( index ), array->get_dimension()->clone() );
 
-                UntypedExpr *inc = new UntypedExpr( update );
-                inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
+        // for stmt's body, eventually containing call
+        CompoundStmt * body = new CompoundStmt( noLabels );
+        Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->get_kids() ), array->get_base(), addCast, forward );
 
-                UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );
-                dstIndex->get_args().push_back( dstParam );
-                dstIndex->get_args().push_back( new VariableExpr( index ) );
-                dstParam = dstIndex;
+        // block containing for stmt and index variable
+        std::list<Statement *> initList;
+        CompoundStmt * block = new CompoundStmt( noLabels );
+        block->get_kids().push_back( new DeclStmt( noLabels, index ) );
+        if ( listInit ) block->get_kids().push_back( listInit );
+        block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
 
-                // srcParam must keep track of the array indices to build the
-                // source parameter and/or array list initializer
-                srcParam.addArrayIndex( new VariableExpr( index ), array->get_dimension()->clone() );
+        *out++ = block;
+    }
 
-                // for stmt's body, eventually containing call
-                CompoundStmt * body = new CompoundStmt( noLabels );
-                Statement * listInit = genCall( srcParam, dstParam, fname, back_inserter( body->get_kids() ), array->get_base(), addCast, forward );
+    template< typename OutputIterator >
+        Statement * genCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
+        if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+            genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
+            return 0;
+        } else {
+            return genScalarCall( srcParam, dstParam, fname, out, type, addCast );
+        }
+    }
 
-                // block containing for stmt and index variable
-                std::list<Statement *> initList;
-                CompoundStmt * block = new CompoundStmt( noLabels );
-                block->get_kids().push_back( new DeclStmt( noLabels, index ) );
-                if ( listInit ) block->get_kids().push_back( listInit );
-                block->get_kids().push_back( new ForStmt( noLabels, initList, cond, inc, body ) );
+    /// inserts into out a generated call expression to function fname with arguments dstParam
+    /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
+    /// object being constructed. The function wraps constructor and destructor calls in an
+    /// ImplicitCtorDtorStmt node.
+    template< typename OutputIterator >
+        void genImplicitCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
+        ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
+        assert( obj );
+        // unnamed bit fields are not copied as they cannot be accessed
+        if ( isUnnamedBitfield( obj ) ) return;
 
-                *out++ = block;
+        bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) );
+        std::list< Statement * > stmts;
+        genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), addCast, forward );
+
+        // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
+        assert( stmts.size() <= 1 );
+        if ( stmts.size() == 1 ) {
+            Statement * callStmt = stmts.front();
+            if ( addCast ) {
+                // implicitly generated ctor/dtor calls should be wrapped
+                // so that later passes are aware they were generated.
+                // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
+                // because this causes the address to be taken at codegen, which is illegal in C.
+                callStmt = new ImplicitCtorDtorStmt( callStmt );
+            }
+            *out++ = callStmt;
         }
-
-        template< typename OutputIterator >
-        Statement * genCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast, bool forward ) {
-                if ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
-                        genArrayCall( srcParam, dstParam, fname, out, at, addCast, forward );
-                        return 0;
-                } else {
-                        return genScalarCall( srcParam, dstParam, fname, out, type, addCast );
-                }
-        }
-
-        /// inserts into out a generated call expression to function fname with arguments dstParam
-        /// and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls. decl is the
-        /// object being constructed. The function wraps constructor and destructor calls in an
-        /// ImplicitCtorDtorStmt node.
-        template< typename OutputIterator >
-        void genImplicitCall( InitTweak::InitExpander &  srcParam, Expression * dstParam, const std::string & fname, OutputIterator out, DeclarationWithType * decl, bool forward = true ) {
-                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( decl );
-                assert( obj );
-                // unnamed bit fields are not copied as they cannot be accessed
-                if ( isUnnamedBitfield( obj ) ) return;
-
-                bool addCast = (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) );
-                std::list< Statement * > stmts;
-                genCall( srcParam, dstParam, fname, back_inserter( stmts ), obj->get_type(), addCast, forward );
-
-                // currently genCall should produce at most one element, but if that changes then the next line needs to be updated to grab the statement which contains the call
-                assert( stmts.size() <= 1 );
-                if ( stmts.size() == 1 ) {
-                        Statement * callStmt = stmts.front();
-                        if ( addCast ) {
-                                // implicitly generated ctor/dtor calls should be wrapped
-                                // so that later passes are aware they were generated.
-                                // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
-                                // because this causes the address to be taken at codegen, which is illegal in C.
-                                callStmt = new ImplicitCtorDtorStmt( callStmt );
-                        }
-                        *out++ = callStmt;
-                }
-        }
+    }
 } // namespace SymTab
 #endif // AUTOGEN_H

src/SymTab/Indexer.cc

@@ -493 +493 @@
                 acceptNewScope( compLitExpr->get_result(), *this );
                 maybeAccept( compLitExpr->get_initializer(), *this );
-        }
-
-        void Indexer::visit( UntypedValofExpr *valofExpr ) {
-                acceptNewScope( valofExpr->get_result(), *this );
-                maybeAccept( valofExpr->get_body(), *this );
         }
 

src/SymTab/Indexer.h

@@ -69 +69 @@
                 virtual void visit( ConstructorExpr * ctorExpr );
                 virtual void visit( CompoundLiteralExpr *compLitExpr );
-                virtual void visit( UntypedValofExpr *valofExpr );
                 virtual void visit( RangeExpr *rangeExpr );
                 virtual void visit( UntypedTupleExpr *tupleExpr );

src/SymTab/Validate.cc

@@ -115 +115 @@
 
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
-        class EnumAndPointerDecayPass final : public Visitor {
-                typedef Visitor Parent;
-                virtual void visit( EnumDecl *aggregateDecl );
-                virtual void visit( FunctionType *func );
+        class EnumAndPointerDecay {
+        public:
+                void previsit( EnumDecl *aggregateDecl );
+                void previsit( FunctionType *func );
         };
 
@@ -126 +126 @@
           public:
                 LinkReferenceToTypes( bool doDebug, const Indexer *indexer );
-          private:
                 using Parent::visit;
                 void visit( EnumInstType *enumInst ) final;
@@ -136 +135 @@
                 void visit( UnionDecl *unionDecl ) final;
                 void visit( TypeInstType *typeInst ) final;
-
+          private:
                 const Indexer *indexer;
 
@@ -147 +146 @@
         };
 
-        /// Replaces array and function types in forall lists by appropriate pointer type
-        class Pass3 final : public Indexer {
+        /// Replaces array and function types in forall lists by appropriate pointer type and assigns each Object and Function declaration a unique ID.
+        class ForallPointerDecay final : public Indexer {
                 typedef Indexer Parent;
           public:
                 using Parent::visit;
-                Pass3( const Indexer *indexer );
-          private:
+                ForallPointerDecay( const Indexer *indexer );
+
                 virtual void visit( ObjectDecl *object ) override;
                 virtual void visit( FunctionDecl *func ) override;
@@ -160 +159 @@
         };
 
-        class ReturnChecker {
+        class ReturnChecker : public WithScopes {
           public:
                 /// Checks that return statements return nothing if their return type is void
@@ -167 +166 @@
           private:
                 void previsit( FunctionDecl * functionDecl );
-                void postvisit( FunctionDecl * functionDecl );
                 void previsit( ReturnStmt * returnStmt );
 
                 typedef std::list< DeclarationWithType * > ReturnVals;
                 ReturnVals returnVals;
-                std::stack< ReturnVals > returnValsStack;
         };
 
@@ -248 +245 @@
 
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
-                EnumAndPointerDecayPass epc;
+                PassVisitor<EnumAndPointerDecay> epc;
                 LinkReferenceToTypes lrt( doDebug, 0 );
-                Pass3 pass3( 0 );
+                ForallPointerDecay fpd( 0 );
                 CompoundLiteral compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
@@ -262 +259 @@
                 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
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
-                acceptAll( translationUnit, pass3 );
+                acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
         }
 
         void validateType( Type *type, const Indexer *indexer ) {
-                EnumAndPointerDecayPass epc;
+                PassVisitor<EnumAndPointerDecay> epc;
                 LinkReferenceToTypes lrt( false, indexer );
-                Pass3 pass3( indexer );
+                ForallPointerDecay fpd( indexer );
                 type->accept( epc );
                 type->accept( lrt );
-                type->accept( pass3 );
+                type->accept( fpd );
         }
 
@@ -356 +353 @@
         }
 
-        void EnumAndPointerDecayPass::visit( EnumDecl *enumDecl ) {
+        void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
@@ -363 +360 @@
                         obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
                 } // for
-                Parent::visit( enumDecl );
         }
 
@@ -370 +366 @@
                 void fixFunctionList( DWTList & dwts, FunctionType * func ) {
                         // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
-                        // entirely other fix ups are handled by the FixFunction class
+                        // entirely. other fix ups are handled by the FixFunction class
                         typedef typename DWTList::iterator DWTIterator;
                         DWTIterator begin( dwts.begin() ), end( dwts.end() );
@@ -389 +385 @@
                                 for ( ; i != end; ++i ) {
                                         FixFunction fixer;
-                                        *i = (*i )->acceptMutator( fixer );
+                                        *i = (*i)->acceptMutator( fixer );
                                         if ( fixer.get_isVoid() ) {
                                                 throw SemanticError( "invalid type void in function type ", func );
@@ -398 +394 @@
         }
 
-        void EnumAndPointerDecayPass::visit( FunctionType *func ) {
+        void EnumAndPointerDecay::previsit( FunctionType *func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->get_parameters(), func );
                 fixFunctionList( func->get_returnVals(), func );
-                Visitor::visit( func );
         }
 
@@ -549 +544 @@
         }
 
-        Pass3::Pass3( const Indexer *other_indexer ) :  Indexer( false ) {
+        ForallPointerDecay::ForallPointerDecay( const Indexer *other_indexer ) :  Indexer( false ) {
                 if ( other_indexer ) {
                         indexer = other_indexer;
@@ -587 +582 @@
         }
 
-        void Pass3::visit( ObjectDecl *object ) {
+        void ForallPointerDecay::visit( ObjectDecl *object ) {
                 forallFixer( object->get_type() );
                 if ( PointerType *pointer = dynamic_cast< PointerType * >( object->get_type() ) ) {
@@ -596 +591 @@
         }
 
-        void Pass3::visit( FunctionDecl *func ) {
+        void ForallPointerDecay::visit( FunctionDecl *func ) {
                 forallFixer( func->get_type() );
                 Parent::visit( func );
@@ -608 +603 @@
 
         void ReturnChecker::previsit( FunctionDecl * functionDecl ) {
-                returnValsStack.push( returnVals );
+                GuardValue( returnVals );
                 returnVals = functionDecl->get_functionType()->get_returnVals();
-        }
-        void ReturnChecker::postvisit( __attribute__((unused)) FunctionDecl * functionDecl ) {
-                returnVals = returnValsStack.top();
-                returnValsStack.pop();
         }