Changeset 884f1409 for src

Timestamp:

Jul 19, 2019, 4:52:59 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

b5ce31e, fd642d2

Parents:

e723100 (diff), 335d81f (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:

• InitTweak/InitTweak.cc (modified) (2 diffs)
• InitTweak/InitTweak.h (modified) (2 diffs)
• ResolvExpr/FindOpenVars.cc (modified) (9 diffs)
• ResolvExpr/FindOpenVars.h (modified) (1 diff)
• ResolvExpr/Occurs.cc (modified) (3 diffs)
• ResolvExpr/ResolveAssertions.cc (modified) (1 diff)
• ResolvExpr/TypeEnvironment.cc (modified) (1 diff)
• ResolvExpr/typeops.h (modified) (2 diffs)
• SynTree/Type.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• Tuples/TupleExpansion.cc (modified) (5 diffs)
• Tuples/Tuples.h (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 10 13:30:00 2019
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jun 19 14:34:00 2019
+// Update Count     : 6
 //
 
@@ -633 +633 @@
                         return nullptr;
                 }
+
+                DeclarationWithType * getFunctionCore( const Expression * expr ) {
+                        if ( const auto * appExpr = dynamic_cast< const ApplicationExpr * >( expr ) ) {
+                                return getCalledFunction( appExpr->function );
+                        } else if ( const auto * untyped = dynamic_cast< const UntypedExpr * >( expr ) ) {
+                                return getCalledFunction( untyped->function );
+                        }
+                        assertf( false, "getFunction with unknown expression: %s", toString( expr ).c_str() );
+                }
         }
 
         DeclarationWithType * getFunction( Expression * expr ) {
-                if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
-                        return getCalledFunction( appExpr->get_function() );
-                } else if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * > ( expr ) ) {
-                        return getCalledFunction( untyped->get_function() );
-                }
-                assertf( false, "getFunction received unknown expression: %s", toString( expr ).c_str() );
+                return getFunctionCore( expr );
+        }
+
+        const DeclarationWithType * getFunction( const Expression * expr ) {
+                return getFunctionCore( expr );
         }
 

src/InitTweak/InitTweak.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 10 13:30:00 2019
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 19 14:18:00 2019
+// Update Count     : 6
 //
 
@@ -61 +61 @@
         /// returns the declaration of the function called by the expr (must be ApplicationExpr or UntypedExpr)
         DeclarationWithType * getFunction( Expression * expr );
+        const DeclarationWithType * getFunction( const Expression * expr );
         const ast::DeclWithType * getFunction( const ast::Expr * expr );
 

src/ResolvExpr/FindOpenVars.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:42:48 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 09:45:25 2015
-// Update Count     : 3
+// Last Modified By : Andrew
+// Last Modified On : Fri Jul 12 14:18:00 2019
+// Update Count     : 4
 //
 
@@ -29 +29 @@
                 FindOpenVars_old( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
 
-                void previsit( PointerType * pointerType );
-                void previsit( ArrayType * arrayType );
-                void previsit( FunctionType * functionType );
-                void previsit( TupleType * tupleType );
+                void previsit( const PointerType * pointerType );
+                void previsit( const ArrayType * arrayType );
+                void previsit( const FunctionType * functionType );
+                void previsit( const TupleType * tupleType );
 
-                void common_action( Type *type );
+                void common_action( const Type *type );
 
                 OpenVarSet &openVars, &closedVars;
@@ -41 +41 @@
         };
 
-        void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {
+        void findOpenVars( const Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {
                 PassVisitor<FindOpenVars_old> finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen );
                 type->accept( finder );
@@ -50 +50 @@
         }
 
-        void FindOpenVars_old::common_action( Type *type ) {
+        void FindOpenVars_old::common_action( const Type * type ) {
                 if ( nextIsOpen ) {
-                        for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 openVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) };
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
@@ -61 +61 @@
                         }
                 } else {
-                        for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 closedVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) };
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
@@ -78 +78 @@
         }
 
-        void FindOpenVars_old::previsit(PointerType *pointerType) {
+        void FindOpenVars_old::previsit(const PointerType * pointerType) {
                 common_action( pointerType );
         }
 
-        void FindOpenVars_old::previsit(ArrayType *arrayType) {
+        void FindOpenVars_old::previsit(const ArrayType * arrayType) {
                 common_action( arrayType );
         }
 
-        void FindOpenVars_old::previsit(FunctionType *functionType) {
+        void FindOpenVars_old::previsit(const FunctionType * functionType) {
                 common_action( functionType );
                 nextIsOpen = ! nextIsOpen;
@@ -92 +92 @@
         }
 
-        void FindOpenVars_old::previsit(TupleType *tupleType) {
+        void FindOpenVars_old::previsit(const TupleType * tupleType) {
                 common_action( tupleType );
         }
@@ -104 +104 @@
                         bool nextIsOpen;
 
-                        FindOpenVars_new( 
-                                ast::OpenVarSet & o, ast::OpenVarSet & c, ast::AssertionSet & n, 
+                        FindOpenVars_new(
+                                ast::OpenVarSet & o, ast::OpenVarSet & c, ast::AssertionSet & n,
                                 ast::AssertionSet & h, FirstMode firstIsOpen )
                         : open( o ), closed( c ), need( n ), have( h ), nextIsOpen( firstIsOpen ) {}
@@ -135 +135 @@
         }
 
-        void findOpenVars( 
-                        const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed, 
+        void findOpenVars(
+                        const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed,
                         ast::AssertionSet & need, ast::AssertionSet & have, FirstMode firstIsOpen ) {
                 ast::Pass< FindOpenVars_new > finder{ open, closed, need, have, firstIsOpen };

src/ResolvExpr/FindOpenVars.h

@@ -26 +26 @@
 namespace ResolvExpr {
         // Updates open and closed variables and their associated assertions
-        void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
+        void findOpenVars( const Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
 
         enum FirstMode { FirstClosed, FirstOpen };

src/ResolvExpr/Occurs.cc

@@ -24 +24 @@
         struct Occurs : public WithVisitorRef<Occurs> {
                 Occurs( std::string varName, const TypeEnvironment &env );
-                void previsit( TypeInstType * typeInst );
+                void previsit( const TypeInstType * typeInst );
 
                 bool result;
@@ -31 +31 @@
         };
 
-        bool occurs( Type *type, std::string varName, const TypeEnvironment &env ) {
+        bool occurs( const Type *type, const std::string & varName, const TypeEnvironment &env ) {
                 PassVisitor<Occurs> occur( varName, env );
                 type->accept( occur );
@@ -45 +45 @@
         }
 
-        void Occurs::previsit( TypeInstType * typeInst ) {
+        void Occurs::previsit( const TypeInstType * typeInst ) {
                 ///   std::cerr << "searching for vars: ";
 ///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cerr, " " ) );

src/ResolvExpr/ResolveAssertions.cc

@@ -73 +73 @@
                 CandidateList matches;
 
-                DeferItem( DeclarationWithType* decl, const AssertionSetValue& info, CandidateList&& matches )
+                DeferItem( const DeclarationWithType* decl, const AssertionSetValue& info, CandidateList&& matches )
                 : decl(decl), info(info), matches(std::move(matches)) {}
 

src/ResolvExpr/TypeEnvironment.cc

@@ -315 +315 @@
         }
 
-        bool isFtype( Type *type ) {
-                if ( dynamic_cast< FunctionType* >( type ) ) {
+        bool isFtype( const Type *type ) {
+                if ( dynamic_cast< const FunctionType * >( type ) ) {
                         return true;
-                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) {
+                } else if ( const TypeInstType *typeInst = dynamic_cast< const TypeInstType * >( type ) ) {
                         return typeInst->get_isFtype();
                 } // if

src/ResolvExpr/typeops.h

@@ -149 +149 @@
 
         // in Occurs.cc
-        bool occurs( Type * type, std::string varName, const TypeEnvironment & env );
+        bool occurs( const Type * type, const std::string & varName, const TypeEnvironment & env );
         // new AST version in TypeEnvironment.cpp (only place it was used in old AST)
 
@@ -200 +200 @@
 
         // in TypeEnvironment.cc
-        bool isFtype( Type * type );
+        bool isFtype( const Type * type );
 } // namespace ResolvExpr
 

src/SynTree/Type.cc

@@ -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 Jan 31 21:54:16 2019
-// Update Count     : 43
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 12 15:48:00 2019
+// Update Count     : 44
 //
 #include "Type.h"
@@ -141 +141 @@
 }
 
+const Type * Type::stripReferences() const {
+        const Type * type;
+        const ReferenceType * ref;
+        for ( type = this; (ref = dynamic_cast<const ReferenceType *>( type )); type = ref->base );
+        return type;
+}
+
 int Type::referenceDepth() const { return 0; }
 

src/SynTree/Type.h

@@ -172 +172 @@
         /// return type without outer references
         Type * stripReferences();
+        const Type * stripReferences() const;
 
         /// return the number of references occuring consecutively on the outermost layer of this type (i.e. do not count references nested within other types)
@@ -256 +257 @@
         BasicType( const Type::Qualifiers & tq, Kind bt, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
 
-        Kind get_kind() { return kind; }
+        Kind get_kind() const { return kind; }
         void set_kind( Kind newValue ) { kind = newValue; }
 

src/Tuples/TupleExpansion.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 13 18:14:12 2019
-// Update Count     : 21
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul 19 14:39:00 2019
+// Update Count     : 22
 //
 
@@ -364 +364 @@
                         ImpurityDetector( bool ignoreUnique ) : ignoreUnique( ignoreUnique ) {}
 
-                        void previsit( ApplicationExpr * appExpr ) {
+                        void previsit( const ApplicationExpr * appExpr ) {
                                 visit_children = false;
-                                if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
-                                        if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
-                                                if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
+                                if ( const DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
+                                        if ( function->linkage == LinkageSpec::Intrinsic ) {
+                                                if ( function->name == "*?" || function->name == "?[?]" ) {
                                                         // intrinsic dereference, subscript are pure, but need to recursively look for impurity
                                                         visit_children = true;
@@ -377 +377 @@
                                 maybeImpure = true;
                         }
-                        void previsit( UntypedExpr * ) { maybeImpure = true; visit_children = false; }
-                        void previsit( UniqueExpr * ) {
+                        void previsit( const UntypedExpr * ) { maybeImpure = true; visit_children = false; }
+                        void previsit( const UniqueExpr * ) {
                                 if ( ignoreUnique ) {
                                         // bottom out at unique expression.
@@ -393 +393 @@
         } // namespace
 
-        bool maybeImpure( Expression * expr ) {
+        bool maybeImpure( const Expression * expr ) {
                 PassVisitor<ImpurityDetector> detector( false );
                 expr->accept( detector );
@@ -399 +399 @@
         }
 
-        bool maybeImpureIgnoreUnique( Expression * expr ) {
+        bool maybeImpureIgnoreUnique( const Expression * expr ) {
                 PassVisitor<ImpurityDetector> detector( true );
                 expr->accept( detector );

src/Tuples/Tuples.h

@@ -55 +55 @@
 
         /// returns true if the expression may contain side-effects.
-        bool maybeImpure( Expression * expr );
+        bool maybeImpure( const Expression * expr );
         bool maybeImpure( const ast::Expr * expr );
 
         /// Returns true if the expression may contain side-effect,
         /// ignoring the presence of unique expressions.
-        bool maybeImpureIgnoreUnique( Expression * expr );
+        bool maybeImpureIgnoreUnique( const Expression * expr );
         bool maybeImpureIgnoreUnique( const ast::Expr * expr );
 } // namespace Tuples