Changeset ee68e11

Timestamp:

Mar 30, 2017, 1:36:51 PM (7 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, resolv-new, with_gc

Children:

814525c

Parents:

b2daebd4 (diff), a4dd728 (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

Files:

• doc/LaTeXmacros/common.tex (modified) (3 diffs)
• doc/generic_types/generic_types.tex (modified) (9 diffs)
• doc/rob_thesis/ctordtor.tex (modified) (1 diff)
• doc/rob_thesis/tuples.tex (modified) (3 diffs)
• src/InitTweak/FixInit.cc (modified) (2 diffs)
• src/InitTweak/GenInit.cc (modified) (1 diff)
• src/libcfa/iostream.c (modified) (1 diff)

doc/LaTeXmacros/common.tex

@@ -42 +42 @@
 \newcommand{\CCfourteen}{\rm C\kern-.1em\hbox{+\kern-.25em+}14\xspace} % C++14 symbolic name
 \newcommand{\CCseventeen}{\rm C\kern-.1em\hbox{+\kern-.25em+}17\xspace} % C++17 symbolic name
+\newcommand{\CCtwenty}{\rm C\kern-.1em\hbox{+\kern-.25em+}20} % C++20 symbolic name
 \newcommand{\Celeven}{C11\xspace}               % C11 symbolic name
 \newcommand{\Csharp}{C\raisebox{0.4ex}{\#}\xspace}      % C# symbolic name
@@ -200 +201 @@
 \newcommand{\opt}{$_{opt}$\ }
 
+\usepackage{varioref}                 % extended references
 % adjust varioref package with default "section" and "page" titles, and optional title with faraway page numbers
 % \VRef{label} => Section 2.7, \VPageref{label} => page 17
@@ -251 +253 @@
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
                 fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert,
-                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,zero_t},
+                _Thread_local,throw,throwResume,trait,try,ttype,typeof,__typeof,__typeof__,zero_t},
 }%
 

doc/generic_types/generic_types.tex

@@ -148 +148 @@
 \label{sec:poly-fns}
 
-\CFA{}'s polymorphism was originally formalized by \citet{Ditchfield92}, and first implemented by \citet{Bilson03}. The signature feature of \CFA{} is parametric-polymorphic functions; such functions are written using a @forall@ clause (which gives the language its name): 
+\CFA{}'s polymorphism was originally formalized by \citet{Ditchfield92}, and first implemented by \citet{Bilson03}. The signature feature of \CFA{} is parametric-polymorphic functions; such functions are written using a @forall@ clause (which gives the language its name):
 \begin{lstlisting}
 forall(otype T)
@@ -174 +174 @@
 forall(otype S | { S ?+?(S, S); })
 S twice(S x) { return x + x; }  // (2)
-\end{lstlisting} 
-This version of @twice@ works for any type @S@ that has an addition operator defined for it, and it could have been used to satisfy the type assertion on @four_times@. 
+\end{lstlisting}
+This version of @twice@ works for any type @S@ that has an addition operator defined for it, and it could have been used to satisfy the type assertion on @four_times@.
 The translator accomplishes this polymorphism by creating a wrapper function calling @twice // (2)@ with @S@ bound to @double@, then providing this wrapper function to @four_times@\footnote{\lstinline@twice // (2)@ could also have had a type parameter named \lstinline@T@; \CFA{} specifies renaming of the type parameters, which would avoid the name conflict with the type variable \lstinline@T@ of \lstinline@four_times@.}.
 
@@ -196 +196 @@
 forall(otype M | has_magnitude(M))
 M max_magnitude( M a, M b ) {
-    return abs(a) < abs(b) ? b : a; 
+    return abs(a) < abs(b) ? b : a;
 }
 \end{lstlisting}
@@ -213 +213 @@
 Given the information provided for an @otype@, variables of polymorphic type can be treated as if they were a complete struct type -- they can be stack-allocated using the @alloca@ compiler builtin, default or copy-initialized, assigned, and deleted. As an example, the @abs@ function above produces generated code something like the following (simplified for clarity and brevity):
 \begin{lstlisting}
-void abs( size_t _sizeof_M, size_t _alignof_M, 
-                void (*_ctor_M)(void*), void (*_copy_M)(void*, void*), 
-                void (*_assign_M)(void*, void*), void (*_dtor_M)(void*), 
-                bool (*_lt_M)(void*, void*), void (*_neg_M)(void*, void*), 
-        void (*_ctor_M_zero)(void*, int), 
+void abs( size_t _sizeof_M, size_t _alignof_M,
+                void (*_ctor_M)(void*), void (*_copy_M)(void*, void*),
+                void (*_assign_M)(void*, void*), void (*_dtor_M)(void*),
+                bool (*_lt_M)(void*, void*), void (*_neg_M)(void*, void*),
+        void (*_ctor_M_zero)(void*, int),
                 void* m, void* _rtn ) {  // polymorphic parameter and return passed as void*
         // M zero = { 0 };
@@ -223 +223 @@
         _ctor_M_zero(zero, 0);  // initialize using zero_t constructor
         // return m < zero ? -m : m;
-        void *_tmp = alloca(_sizeof_M)
+        void *_tmp = alloca(_sizeof_M);
         _copy_M( _rtn,  // copy-initialize return value
                 _lt_M( m, zero ) ?  // check condition
@@ -323 +323 @@
 In some cases the offset arrays cannot be statically generated. For instance, modularity is generally provided in C by including an opaque forward-declaration of a struct and associated accessor and mutator routines in a header file, with the actual implementations in a separately-compiled \texttt{.c} file. \CFA{} supports this pattern for generic types, and in this instance the caller does not know the actual layout or size of the dynamic generic type, and only holds it by pointer. The \CFA{} translator automatically generates \emph{layout functions} for cases where the size, alignment, and offset array of a generic struct cannot be passed in to a function from that function's caller. These layout functions take as arguments pointers to size and alignment variables and a caller-allocated array of member offsets, as well as the size and alignment of all @sized@ parameters to the generic struct (un-@sized@ parameters are forbidden from the language from being used in a context that affects layout). Results of these layout functions are cached so that they are only computed once per type per function.%, as in the example below for @pair@.
 % \begin{lstlisting}
-% static inline void _layoutof_pair(size_t* _szeof_pair, size_t* _alignof_pair, size_t* _offsetof_pair, 
+% static inline void _layoutof_pair(size_t* _szeof_pair, size_t* _alignof_pair, size_t* _offsetof_pair,
 %               size_t _szeof_R, size_t _alignof_R, size_t _szeof_S, size_t _alignof_S) {
 %     *_szeof_pair = 0; // default values
@@ -332 +332 @@
 %     *_szeof_pair += _szeof_R;
 %     if ( *_alignof_pair < _alignof_R ) *_alignof_pair = _alignof_R;
-        
+
 %       // padding, offset, size, and alignment of second field
 %     if ( *_szeof_pair & (_alignof_S - 1) )
@@ -754 +754 @@
 f(x.field_0, (_tuple2){ x.field_1, 'z' });
 \end{lstlisting}
-Note that due to flattening, @x@ used in the argument position is converted into the list of its fields. In the call to @f@, a the second and third argument components are structured into a tuple argument. Similarly, tuple member expressions are recursively expanded into a list of member access expressions.
+Note that due to flattening, @x@ used in the argument position is converted into the list of its fields. In the call to @f@, the second and third argument components are structured into a tuple argument. Similarly, tuple member expressions are recursively expanded into a list of member access expressions.
 
 Expressions that may contain side effects are made into \emph{unique expressions} before being expanded by the flattening conversion. Each unique expression is assigned an identifier and is guaranteed to be executed exactly once:
@@ -774 +774 @@
 );
 \end{lstlisting}
-Since argument evaluation order is not specified by the C programming language, this scheme is built to work regardless of evaluation order. The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is true to true. Every subsequent evaluation of the unique expression then results in an access to the stored result of the actual expression. Tuple member expressions also take advantage of unique expressions in the case of possible impurity.
+Since argument evaluation order is not specified by the C programming language, this scheme is built to work regardless of evaluation order. The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is set to true. Every subsequent evaluation of the unique expression then results in an access to the stored result of the actual expression. Tuple member expressions also take advantage of unique expressions in the case of possible impurity.
 
 Currently, the \CFA{} translator has a very broad, imprecise definition of impurity, where any function call is assumed to be impure. This notion could be made more precise for certain intrinsic, auto-generated, and builtin functions, and could analyze function bodies when they are available to recursively detect impurity, to eliminate some unique expressions.

doc/rob_thesis/ctordtor.tex

@@ -135 +135 @@
 %   at the global scope (which is likely the most common case)
 % * [9]
-
-% Move semantics
-% * <ongoing discussion about this. this will be filled in
-%    once we come to a consensus>
 
 % Changes to polymorphic type classes

doc/rob_thesis/tuples.tex

@@ -615 +615 @@
 \end{cfacode}
 Note that due to flattening, @x@ used in the argument position is converted into the list of its fields.
-In the call to @f@, a the second and third argument components are structured into a tuple argument.
+In the call to @f@, the second and third argument components are structured into a tuple argument.
 
 Expressions which may contain side effects are made into \emph{unique expressions} before being expanded by the flattening conversion.
@@ -643 +643 @@
 \end{cfacode}
 Since argument evaluation order is not specified by the C programming language, this scheme is built to work regardless of evaluation order.
-The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is true to true.
+The first time a unique expression is executed, the actual expression is evaluated and the accompanying boolean is set to true.
 Every subsequent evaluation of the unique expression then results in an access to the stored result of the actual expression.
 
@@ -1299 +1299 @@
 Thunks 0 through 3 provide wrappers for the @otype@ parameters for @const char *@, while @_thunk4@ translates a call to @print([int, const char *])@ into a call to @print_variadic(int, [const char *])@.
 This all builds to a call to @print_variadic@, with the appropriate copy construction of the tuple argument.
+
+\section{Future Work}

src/InitTweak/FixInit.cc

@@ -738 +738 @@
                                                 stmtsToAddAfter.push_back( ifStmt );
 
-                                                if ( ctorInit->get_dtor() ) {
+                                                Statement * dtor = ctorInit->get_dtor();
+                                                objDecl->set_init( NULL );
+                                                ctorInit->set_ctor( NULL );
+                                                ctorInit->set_dtor( nullptr );
+                                                if ( dtor ) {
                                                         // if the object has a non-trivial destructor, have to
                                                         // hoist it and the object into the global space and
                                                         // call the destructor function with atexit.
 
-                                                        Statement * dtorStmt = ctorInit->get_dtor()->clone();
+                                                        Statement * dtorStmt = dtor->clone();
 
                                                         // void __objName_dtor_atexitN(...) {...}
@@ -772 +776 @@
                                                         objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
-                                                        objDecl->set_init( NULL );
-                                                        ctorInit->set_ctor( NULL );
-                                                        delete ctorInit;
-
                                                         // xxx - temporary hack: need to return a declaration, but want to hoist the current object out of this scope
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
                                                         ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        delete ctorInit;
                                                         return dummy;
                                                 }

src/InitTweak/GenInit.cc

@@ -294 +294 @@
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
-                // if global but initializer is not constexpr, always try to construct, since this is not legal C
-                if ( ( tryConstruct( objDecl ) && isManaged( objDecl ) ) || (! inFunction && ! isConstExpr( objDecl->get_init() ) ) ) {
+                // even if unmanaged, try to construct global or static if initializer is not constexpr, since this is not legal C
+                if ( tryConstruct( objDecl ) && ( isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
-                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
+                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl );
                         // constructed objects should not have initializers nested too deeply
                         if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl );

src/libcfa/iostream.c

@@ -154 +154 @@
 ostype * ?|?( ostype * os, const char * cp ) {
         enum { Open = 1, Close, OpenClose };
-        static const unsigned char mask[256] = {
+        static const unsigned char mask[256] @= {
                 // opening delimiters, no space after
                 ['('] : Open, ['['] : Open, ['{'] : Open,