Changeset 30dcc47

Timestamp:

May 2, 2018, 2:59:29 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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, with_gc

Children:

44bca7f

Parents:

7f0001c (diff), 6f326b1 (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:

• Common/PassVisitor.impl.h (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/Mangler.cc (modified) (3 diffs)
• libcfa/interpose.c (modified) (4 diffs)
• tests/references.c (modified) (2 diffs)

src/Common/PassVisitor.impl.h

@@ -690 +690 @@
         VISIT_START( node );
 
-        maybeAccept_impl( node->condition, *this );
-        maybeAccept_impl( node->message  , *this );
+        node->condition = visitExpression( node->condition );
+        maybeAccept_impl( node->message, *this );
 
         VISIT_END( node );
@@ -700 +700 @@
         MUTATE_START( node );
 
-        maybeMutate_impl( node->condition, *this );
-        maybeMutate_impl( node->message  , *this );
+        node->condition = mutateExpression( node->condition );
+        maybeMutate_impl( node->message, *this );
 
         MUTATE_END( StaticAssertDecl, node );

src/ResolvExpr/AlternativeFinder.cc

@@ -459 +459 @@
         /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
-                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->forall.begin(); tyvar != type->forall.end(); ++tyvar ) {
                         unifiableVars[ (*tyvar)->get_name() ] = TypeDecl::Data{ *tyvar };
-                        for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
+                        for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->assertions.begin(); assert != (*tyvar)->assertions.end(); ++assert ) {
                                 needAssertions[ *assert ].isUsed = true;
                         }

src/ResolvExpr/AlternativeFinder.h

@@ -126 +126 @@
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
 
+        /// Adds type variables to the open variable set and marks their assertions
+        void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions );
+
         template< typename InputIterator >
         void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {

src/ResolvExpr/Resolver.cc

@@ -544 +544 @@
                                                         OpenVarSet openVars;
                                                         AssertionSet resultNeed, resultHave;
-                                                        TypeEnvironment resultEnv;
+                                                        TypeEnvironment resultEnv( func.env );
+                                                        makeUnifiableVars( function, openVars, resultNeed );
+                                                        // add all type variables as open variables now so that those not used in the parameter
+                                                        // list are still considered open.
+                                                        resultEnv.add( function->forall );
 
                                                         // Load type variables from arguemnts into one shared space

src/SymTab/Mangler.cc

@@ -178 +178 @@
                                 printQualifiers( pointerType );
                                 mangleName << "P";
-                                maybeAccept( pointerType->get_base(), *visitor );
+                                maybeAccept( pointerType->base, *visitor );
                         }
 
@@ -185 +185 @@
                                 printQualifiers( arrayType );
                                 mangleName << "A0";
-                                maybeAccept( arrayType->get_base(), *visitor );
+                                maybeAccept( arrayType->base, *visitor );
                         }
 
@@ -191 +191 @@
                                 printQualifiers( refType );
                                 mangleName << "R";
-                                maybeAccept( refType->get_base(), *visitor );
+                                maybeAccept( refType->base, *visitor );
                         }
 

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  8 16:18:09 2018
-// Update Count     : 75
+// Last Modified On : Tue May  1 15:05:35 2018
+// Update Count     : 83
 //
 
@@ -95 +95 @@
 void sigHandler_fpe  ( __CFA_SIGPARMS__ );
 void sigHandler_abort( __CFA_SIGPARMS__ );
+void sigHandler_term ( __CFA_SIGPARMS__ );
 
 struct {
@@ -114 +115 @@
                 __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO ); // Failure handler
                 __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO ); // Failure handler
+                __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO ); // Failure handler
+                __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO ); // Failure handler
         }
 }
@@ -268 +271 @@
 }
 
+void sigHandler_term( __CFA_SIGPARMS__ ) {
+        abort( "Application stopped by %s signal.", sig == SIGINT ? "an interrupt (SIGINT)" : "a terminate (SIGTERM)" );
+}
+
 // Local Variables: //
 // mode: c //

src/tests/references.c

@@ -45 +45 @@
 }
 
+// --- temporary code needed to make array of references subscript work.
+extern "C" {
+  void ** __index(__attribute__ ((unused)) size_t sizeof_T, __attribute__ ((unused)) size_t alignof_T, void **x, ptrdiff_t y) {
+    return (void **)((char *)x+y*sizeof(void *));
+  }
+  void __ctor(void ***dst, void **src) {
+    *dst = src;
+  }
+}
+__attribute__((alias("__index"))) forall( dtype T | sized(T) ) T && ?[?]( T & * x, ptrdiff_t y );
+__attribute__((alias("__ctor"))) forall( dtype DT ) void ?{}( DT & * & dst, DT & * src);
+forall( dtype DT ) void ^?{}( DT & * & ) {}
+// --- end of temporary code
+
 int main() {
         int x = 123456, x2 = 789, *p1 = &x, **p2 = &p1, ***p3 = &p2,
@@ -52 +66 @@
         *p3 = &p1;                          // change p2
         int y = 0, z = 11, & ar[3] = { x, y, z };    // initialize array of references
-        // &ar[1] = &z;                        // change reference array element
-        // typeof( ar[1] ) p;                  // is int, i.e., the type of referenced object
-        // typeof( &ar[1] ) q;                 // is int &, i.e., the type of reference
-        // sizeof( ar[1] ) == sizeof( int );   // is true, i.e., the size of referenced object
-        // sizeof( &ar[1] ) == sizeof( int *); // is true, i.e., the size of a reference
+        &ar[1] = &z;                        // change reference array element
+        typeof( ar[1] ) p = 3;              // is int, i.e., the type of referenced object
+        typeof( &ar[1] ) q = &x;            // is int *, i.e., the type of pointer
+        _Static_assert( sizeof( ar[1] ) == sizeof( int ), "Array type should be int." );   // is true, i.e., the size of referenced object
+        _Static_assert( sizeof( &ar[1] ) == sizeof( int *), "Address of array should be int *." ); // is true, i.e., the size of a reference
 
         ((int*&)&r3) = &x;                  // change r1, (&*)**r3