Index: Jenkins/FullBuild =================================================================== --- Jenkins/FullBuild (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ Jenkins/FullBuild (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -99,12 +99,14 @@ //attach the build log to the email catch (Exception caughtError) { + echo('error caught') + //rethrow error later err = caughtError //Store the result of the build log - currentBuild.result = "${status_prefix} FAILURE".trim() + currentBuild.result = 'FAILURE' //Send email to notify the failure - promote_email(currentBuild.result) + promote_failure_email() } @@ -121,5 +123,7 @@ //Email notification on a full build failure -def promote_email(String status) { +def promote_failure_email() { + echo('notifying users') + //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line //Configurations for email format @@ -134,5 +138,5 @@ - Status -------------------------------------------------------------- -PROMOTE FAILURE - ${status} +PROMOTE FAILURE """ Index: doc/aaron_comp_II/comp_II.tex =================================================================== --- doc/aaron_comp_II/comp_II.tex (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ doc/aaron_comp_II/comp_II.tex (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -37,4 +37,7 @@ \setlength{\headsep}{0.25in} +\usepackage{caption} +\usepackage{subcaption} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -61,4 +64,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand{\bigO}[1]{O\!\left( #1 \right)} \begin{document} @@ -116,5 +121,7 @@ The ©identity© function above can be applied to any complete object type (or ``©otype©''). The type variable ©T© is transformed into a set of additional implicit parameters to ©identity© which encode sufficient information about ©T© to create and return a variable of that type. -The current \CFA implementation passes the size and alignment of the type represented by an ©otype© parameter, as well as an assignment operator, constructor, copy constructor and destructor. +The current \CFA implementation passes the size and alignment of the type represented by an ©otype© parameter, as well as an assignment operator, constructor, copy constructor and destructor. +Here, the runtime cost of polymorphism is spread over each polymorphic call, due to passing more arguments to polymorphic functions; preliminary experiments have shown this overhead to be similar to \CC virtual function calls. +Determining if packaging all polymorphic arguments to a function into a virtual function table would reduce the runtime overhead of polymorphic calls is an open research question. Since bare polymorphic types do not provide a great range of available operations, \CFA also provides a \emph{type assertion} mechanism to provide further information about a type: @@ -129,25 +136,25 @@ double magic = four_times(10.5); // T is bound to double, uses (1) to satisfy type assertion \end{lstlisting} -These type assertions may be either variable or function declarations which depend on a polymorphic type variable. -©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function will be passed as an additional implicit parameter to the call to ©four_times©. +These type assertions may be either variable or function declarations that depend on a polymorphic type variable. +©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function is passed as an additional implicit parameter to the call to ©four_times©. Monomorphic specializations of polymorphic functions can themselves be used to satisfy type assertions. -For instance, ©twice© could have been defined as below, using the \CFA syntax for operator overloading: -\begin{lstlisting} -forall(otype S | { S ?+?(S, S); }) +For instance, ©twice© could have been defined using the \CFA syntax for operator overloading as: +\begin{lstlisting} +forall(otype S | { ®S ?+?(S, S);® }) S twice(S x) { return x + x; } // (2) \end{lstlisting} -This version of ©twice© will work 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©. +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 compiler accomplishes this by creating a wrapper function calling ©twice // (2)© with ©S© bound to ©double©, then providing this wrapper function to ©four_times©\footnote{©twice // (2)© could also have had a type parameter named ©T©; \CFA specifies renaming of the type parameters, which would avoid the name conflict with the type variable ©T© of ©four_times©.}. Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration in the current scope. -If a polymorphic function can be used to satisfy one of its own type assertions, this recursion may not terminate, as it is possible that function will be examined as a candidate for its own type assertion unboundedly repeatedly. -To avoid infinite loops, the current CFA compiler imposes a fixed limit on the possible depth of recursion, similar to that employed by most \CC compilers for template expansion; this restriction means that there are some semantically well-typed expressions which cannot be resolved by CFA. -One area of potential improvement this project proposes to investigate is the possibility of using the compiler's knowledge of the current set of declarations to more precicely determine when further type assertion satisfaction recursion will not produce a well-typed expression. +If a polymorphic function can be used to satisfy one of its own type assertions, this recursion may not terminate, as it is possible that function is examined as a candidate for its own type assertion unboundedly repeatedly. +To avoid infinite loops, the current CFA compiler imposes a fixed limit on the possible depth of recursion, similar to that employed by most \CC compilers for template expansion; this restriction means that there are some semantically well-typed expressions that cannot be resolved by CFA. +One area of potential improvement this project proposes to investigate is the possibility of using the compiler's knowledge of the current set of declarations to more precicely determine when further type assertion satisfaction recursion does not produce a well-typed expression. \subsubsection{Traits} \CFA provides \emph{traits} as a means to name a group of type assertions, as in the example below: \begin{lstlisting} -trait has_magnitude(otype T) { +®trait has_magnitude(otype T)® { bool ?value; +} +\end{lstlisting} + +In the example above, ©(list_iterator, int)© satisfies ©pointer_like© by the given function, and ©(list_iterator, list)© also satisfies ©pointer_like© by the built-in pointer dereference operator. +While a nominal-inheritance system with associated types could model one of those two relationships by making ©El© an associated type of ©Ptr© in the ©pointer_like© implementation, few such systems could model both relationships simultaneously. + +The flexibility of \CFA's implicit trait satisfaction mechanism provides user programmers with a great deal of power, but also blocks some optimization approaches for expression resolution. +The ability of types to begin to or cease to satisfy traits when declarations go into or out of scope makes caching of trait satisfaction judgements difficult, and the ability of traits to take multiple type parameters could lead to a combinatorial explosion of work in any attempt to pre-compute trait satisfaction relationships. +On the other hand, the addition of a nominal inheritance mechanism to \CFA's type system or replacement of \CFA's trait satisfaction system with a more object-oriented inheritance model and investigation of possible expression resolution optimizations for such a system may be an interesting avenue of further research. \subsection{Name Overloading} -In C, no more than one function or variable in the same scope may share the same name, and function or variable declarations in inner scopes with the same name as a declaration in an outer scope hide the outer declaration. -This makes finding the proper declaration to match to a function application or variable expression a simple matter of symbol table lookup, which can be easily and efficiently implemented. -\CFA, on the other hand, allows overloading of variable and function names, so long as the overloaded declarations do not have the same type, avoiding the multiplication of function names for different types common in the C standard library, as in the following example: -\begin{lstlisting} -int three = 3; -double three = 3.0; - -int thrice(int i) { return i * three; } // uses int three -double thrice(double d) { return d * three; } // uses double three - -// thrice(three); // ERROR: ambiguous -int nine = thrice(three); // uses int thrice and three, based on return type -double nine = thrice(three); // uses double thrice and three, based on return type -\end{lstlisting} - -The presence of name overloading in \CFA means that simple table lookup is not sufficient to match identifiers to declarations, and a type matching algorithm must be part of expression resolution. +In C, no more than one variable or function in the same scope may share the same name\footnote{Technically, C has multiple separated namespaces, one holding ©struct©, ©union©, and ©enum© tags, one holding labels, one holding typedef names, variable, function, and enumerator identifiers, and one for each ©struct© or ©union© type holding the field names.}, and variable or function declarations in inner scopes with the same name as a declaration in an outer scope hide the outer declaration. +This makes finding the proper declaration to match to a variable expression or function application a simple matter of symbol table lookup, which can be easily and efficiently implemented. +\CFA, on the other hand, allows overloading of variable and function names, so long as the overloaded declarations do not have the same type, avoiding the multiplication of variable and function names for different types common in the C standard library, as in the following example: +\begin{lstlisting} +#include + +int max(int a, int b) { return a < b ? b : a; } // (1) +double max(double a, double b) { return a < b ? b : a; } // (2) + +int max = INT_MAX; // (3) +double max = DBL_MAX; // (4) + +max(7, -max); // uses (1) and (3), by matching int type of 7 +max(max, 3.14); // uses (2) and (4), by matching double type of 3.14 + +max(max, -max); // ERROR: ambiguous +int m = max(max, -max); // uses (1) and (3) twice, by return type +\end{lstlisting} + +The presence of name overloading in \CFA means that simple table lookup is insufficient to match identifiers to declarations, and a type matching algorithm must be part of expression resolution. \subsection{Implicit Conversions} @@ -194,6 +242,9 @@ C does not have a traditionally-defined inheritance hierarchy of types, but the C standard's rules for the ``usual arithmetic conversions'' define which of the built-in types are implicitly convertable to which other types, and the relative cost of any pair of such conversions from a single source type. \CFA adds to the usual arithmetic conversions rules for determining the cost of binding a polymorphic type variable in a function call; such bindings are cheaper than any \emph{unsafe} (narrowing) conversion, \eg ©int© to ©char©, but more expensive than any \emph{safe} (widening) conversion, \eg ©int© to ©double©. + The expression resolution problem, then, is to find the unique minimal-cost interpretation of each expression in the program, where all identifiers must be matched to a declaration and implicit conversions or polymorphic bindings of the result of an expression may increase the cost of the expression. -Note that which subexpression interpretation is minimal-cost may require contextual information to disambiguate. +Note that which subexpression interpretation is minimal-cost may require contextual information to disambiguate. +For instance, in the example in the previous subsection, ©max(max, -max)© cannot be unambiguously resolved, but ©int m = max(max, -max);© has a single minimal-cost resolution. +©int m = (int)max((double)max, -(double)max)© is also be a valid interpretation, but is not minimal-cost due to the unsafe cast from the ©double© result of ©max© to ©int© (the two ©double© casts function as type ascriptions selecting ©double max© rather than casts from ©int max© to ©double©, and as such are zero-cost). \subsubsection{User-generated Implicit Conversions} @@ -201,17 +252,57 @@ Such a conversion system should be simple for user programmers to utilize, and fit naturally with the existing design of implicit conversions in C; ideally it would also be sufficiently powerful to encode C's usual arithmetic conversions itself, so that \CFA only has one set of rules for conversions. -Ditchfield\cite{Ditchfield:conversions} has laid out a framework for using polymorphic conversion constructor functions to create a directed acyclic graph (DAG) of conversions. +Ditchfield~\cite{Ditchfield:conversions} has laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. A monomorphic variant of these functions can be used to mark a conversion arc in the DAG as only usable as the final step in a conversion. With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented as path length through the DAG. -Open research questions on this topic include whether a conversion graph can be generated that represents each allowable conversion in C with a unique minimal-length path, such that the path lengths accurately represent the relative costs of the conversions, whether such a graph representation can be usefully augmented to include user-defined types as well as built-in types, and whether the graph can be efficiently represented and included in the expression resolver. +\begin{figure}[h] +\centering +\includegraphics{conversion_dag} +\caption{A portion of the implicit conversion DAG for built-in types.} +\end{figure} +As can be seen in the example DAG above, there are either safe or unsafe paths between each of the arithmetic types listed; the ``final'' arcs are important both to avoid creating cycles in the signed-unsigned conversions, and to disambiguate potential diamond conversions (\eg, if the ©int© to ©unsigned int© conversion was not marked final there would be two length-two paths from ©int© to ©unsigned long©, and it would be impossible to choose which one; however, since the ©unsigned int© to ©unsigned long© arc can not be traversed after the final ©int© to ©unsigned int© arc, there is a single unambiguous conversion path from ©int© to ©unsigned long©). + +Open research questions on this topic include: +\begin{itemize} +\item Can a conversion graph be generated that represents each allowable conversion in C with a unique minimal-length path such that the path lengths accurately represent the relative costs of the conversions? +\item Can such a graph representation can be usefully augmented to include user-defined types as well as built-in types? +\item Can the graph can be efficiently represented and used in the expression resolver? +\end{itemize} \subsection{Constructors and Destructors} Rob Shluntz, a current member of the \CFA research team, has added constructors and destructors to \CFA. -Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor; for struct types these functions each call their equivalents on each field of the struct. +Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor; for ©struct© types these functions each call their equivalents on each field of the ©struct©. This affects expression resolution because an ©otype© type variable ©T© implicitly adds four type assertions, one for each of these four functions, so assertion resolution is pervasive in \CFA polymorphic functions, even those without any explicit type assertions. +The following example shows the implicitly-generated code in green: +\begin{lstlisting} +struct kv { + int key; + char *value; +}; + +¢void ?{}(kv *this) { + ?{}(&this->key); + ?{}(&this->value); +} +void ?{}(kv *this, kv that) { + ?{}(&this->key, that.key); + ?{}(&this->value, that.value); +} +kv ?=?(kv *this, kv that) { + ?=?(&this->key, that.key); + ?=?(&this->value, that.value); + return *this; +} +void ^?{}(kv *this) { + ^?{}(&this->key); + ^?{}(&this->value); +}¢ + +forall(otype T ¢| { void ?{}(T*); void ?{}(T*, T); T ?=?(T*, T); void ^?{}(T*); }¢) +void foo(T); +\end{lstlisting} \subsection{Generic Types} I have already added a generic type capability to \CFA, designed to efficiently and naturally integrate with \CFA's existing polymorphic functions. -A generic type can be declared by placing a ©forall© specifier on a struct or union declaration, and instantiated using a parenthesized list of types after the type name: +A generic type can be declared by placing a ©forall© specifier on a ©struct© or ©union© declaration, and instantiated using a parenthesized list of types after the type name: \begin{lstlisting} forall(otype R, otype S) struct pair { @@ -229,15 +320,29 @@ The default-generated constructors, destructor and assignment operator for a generic type are polymorphic functions with the same list of type parameters as the generic type definition. -Aside from giving users the ability to create more parameterized types than just the built-in pointer, array and function types, the combination of generic types with polymorphic functions and implicit conversions makes the edge case where a polymorphic function can match its own assertions much more common, as follows: +Aside from giving users the ability to create more parameterized types than just the built-in pointer, array and function types, the combination of generic types with polymorphic functions and implicit conversions makes the edge case where the resolver may enter an infinite loop much more common, as in the following code example: +\begin{lstlisting} +forall(otype T) struct box { T x; }; + +void f(void*); // (1) + +forall(otype S) +void f(box(S)* b) { // (2) + f(®(void*)0®); +} +\end{lstlisting} + +The loop in the resolver happens as follows: \begin{itemize} -\item Given an expression in an untyped context, such as a top-level function call with no assignment of return values, apply a polymorphic implicit conversion to the expression that can produce multiple types (the built-in conversion from ©void*© to any other pointer type is one, but not the only). -\item When attempting to use a generic type with ©otype© parameters (such as ©box© above) for the result type of the expression, the resolver will also need to decide what type to use for the ©otype© parameters on the constructors and related functions, and will have no constraints on what they may be. -\item Attempting to match some yet-to-be-determined specialization of the generic type to this ©otype© parameter will create a recursive case of the default constructor, \etc matching their own type assertions, creating an unboundedly deep nesting of the generic type inside itself. +\item Since there is an implicit conversion from ©void*© to any pointer type, the highlighted expression can be interpreted as either a ©void*©, matching ©f // (1)©, or a ©box(S)*© for some type ©S©, matching ©f // (2)©. +\item To determine the cost of the ©box(S)© interpretation, a type must be found for ©S© which satisfies the ©otype© implicit type assertions (assignment operator, default and copy constructors, and destructor); one option is ©box(S2)© for some type ©S2©. +\item The assignment operator, default and copy constructors, and destructor of ©box(T)© are also polymorphic functions, each of which require the type parameter ©T© to have an assignment operator, default and copy constructors, and destructor. When choosing an interpretation for ©S2©, one option is ©box(S3)©, for some type ©S3©. +\item The previous step repeats until stopped, with four times as much work performed at each step. \end{itemize} -As discussed above, any \CFA expression resolver must handle this possible infinite recursion somehow, but the combination of generic types with other language features makes this particular edge case occur somewhat frequently in user code. +This problem can occur in any resolution context where a polymorphic function that can satisfy its own type assertions is required for a possible interpretation of an expression with no constraints on its type, and is thus not limited to combinations of generic types with ©void*© conversions, though constructors for generic types often satisfy their own assertions and a polymorphic conversion such as the ©void*© conversion to a polymorphic variable can create an expression with no constraints on its type. +As discussed above, the \CFA expression resolver must handle this possible infinite recursion somehow, and it occurs fairly naturally in code like the above that uses generic types. \subsection{Tuple Types} -\CFA adds \emph{tuple types} to C, a facility for referring to multiple values with a single identifier. -A variable may name a tuple, and a function may return one. +\CFA adds \emph{tuple types} to C, a syntactic facility for referring to lists of values anonymously or with a single identifier. +An identifier may name a tuple, and a function may return one. Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap© below: \begin{lstlisting} @@ -248,5 +353,5 @@ x = swap( x ); // destructure [char, char] x into two elements of parameter list -// can't use int x for parameter, not enough arguments to swap +// cannot use int x for parameter, not enough arguments to swap \end{lstlisting} Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above. @@ -256,13 +361,23 @@ Given some type ©T©, a ©T&© (``reference to ©T©'') is essentially an automatically dereferenced pointer; with these semantics most of the C standard's discussions of lvalues can be expressed in terms of references instead, with the benefit of being able to express the difference between the reference and non-reference version of a type in user code. References preserve C's existing qualifier-dropping lvalue-to-rvalue conversion (\eg a ©const volatile int&© can be implicitly converted to a bare ©int©); the reference proposal also adds a rvalue-to-lvalue conversion to \CFA, implemented by storing the value in a new compiler-generated temporary and passing a reference to the temporary. -These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary. +These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary, as below: +\begin{lstlisting} +const int magic = 42; + +void inc_print( int& x ) { printf("%d\n", ++x); } + +print_inc( magic ); // legal; implicitly generated code in green below: + +¢int tmp = magic;¢ // copies to safely strip const-qualifier +¢print_inc( tmp );¢ // tmp is incremented, magic is unchanged +\end{lstlisting} These reference conversions may also chain with the other implicit type conversions. The main implication of this for expression resolution is the multiplication of available implicit conversions, though in a restricted context that may be able to be treated efficiently as a special case. -\subsection{Literal Types} -Another proposal currently under consideration for the \CFA type-system is assigning special types to the literal values ©0© and ©1©.%, say ©zero_t© and ©one_t©. -Implicit conversions from these types would allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precicely. -This is a generalization of C's existing behaviour of treating ©0© as either an integer zero or a null pointer constant, and treating either of those values as boolean false. -The main implication for expression resolution is that the frequently encountered expressions ©0© and ©1© may have a significant number of valid interpretations. +\subsection{Special Literal Types} +Another proposal currently under consideration for the \CFA type-system is assigning special types to the literal values ©0© and ©1©. +Implicit conversions from these types allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precicely. +This approach is a generalization of C's existing behaviour of treating ©0© as either an integer zero or a null pointer constant, and treating either of those values as boolean false. +The main implication for expression resolution is that the frequently encountered expressions ©0© and ©1© may have a large number of valid interpretations. \subsection{Deleted Function Declarations} @@ -271,40 +386,69 @@ int somefn(char) = delete; \end{lstlisting} +This feature is typically used in \CCeleven to make a type non-copyable by deleting its copy constructor and assignment operator, or forbidding some interpretations of a polymorphic function by specifically deleting the forbidden overloads. To add a similar feature to \CFA would involve including the deleted function declarations in expression resolution along with the normal declarations, but producing a compiler error if the deleted function was the best resolution. How conflicts should be handled between resolution of an expression to both a deleted and a non-deleted function is a small but open research question. \section{Expression Resolution} -The expression resolution problem is essentially to determine an optimal matching between some combination of argument interpretations and the parameter list of some overloaded instance of a function; the argument interpretations are produced by recursive invocations of expression resolution, where the base case is zero-argument functions (which are, for purposes of this discussion, semantically equivalent to named variables or constant literal expressions). -Assuming that the matching between a function's parameter list and a combination of argument interpretations can be done in $O(p^k)$ time, where $p$ is the number of parameters and $k$ is some positive number, if there are $O(i)$ valid interpretations for each subexpression, there will be $O(i)$ candidate functions and $O(i^p)$ possible argument combinations for each expression, so a single recursive call to expression resolution will take $O(i^{p+1} \cdot p^k)$ time if it compares all combinations. -Given this bound, resolution of a single top-level expression tree of depth $d$ takes $O(i^{p+1} \cdot p^{k \cdot d})$ time\footnote{The call tree will have leaves at depth $O(d)$, and each internal node will have $O(p)$ fan-out, producing $O(p^d)$ total recursive calls.}. -Expression resolution is somewhat unavoidably exponential in $p$, the number of function parameters, and $d$, the depth of the expression tree, but these values are fixed by the user programmer, and generally bounded by reasonably small constants. -$k$, on the other hand, is mostly dependent on the representation of types in the system and the efficiency of type assertion checking; if a candidate argument combination can be compared to a function parameter list in linear time in the length of the list (\ie $k = 1$), then the $p^{k \cdot d}$ term is linear in the input size of the source code for the expression, otherwise the resolution algorithm will exibit sub-linear performance scaling on code containing more-deeply nested expressions. +The expression resolution problem is determining an optimal match between some combination of argument interpretations and the parameter list of some overloaded instance of a function; the argument interpretations are produced by recursive invocations of expression resolution, where the base case is zero-argument functions (which are, for purposes of this discussion, semantically equivalent to named variables or constant literal expressions). +Assuming that the matching between a function's parameter list and a combination of argument interpretations can be done in $\bigO{p^k}$ time, where $p$ is the number of parameters and $k$ is some positive number, if there are $\bigO{i}$ valid interpretations for each subexpression, there will be $\bigO{i}$ candidate functions and $\bigO{i^p}$ possible argument combinations for each expression, so for a single recursive call expression resolution takes $\bigO{i^{p+1} \cdot p^k}$ time if it must compare all combinations, or $\bigO{i(p+1) \cdot p^k}$ time if argument-parameter matches can be chosen independently of each other. +Given these bounds, resolution of a single top-level expression tree of depth $d$ takes $\bigO{i^{p+1} \cdot p^{k \cdot d}}$ time under full-combination matching, or $\bigO{i(p+1) \cdot p^{k \cdot d}}$ time for independent-parameter matching\footnote{A call tree has leaves at depth $\bigO{d}$, and each internal node has $\bigO{p}$ fan-out, producing $\bigO{p^d}$ total recursive calls.}. + +Expression resolution is somewhat unavoidably exponential in $d$, the depth of the expression tree, and if arguments cannot be matched to parameters independently of each other, expression resolution is also exponential in $p$. +However, both $d$ and $p$ are fixed by the user programmer, and generally bounded by reasonably small constants. +$k$, on the other hand, is mostly dependent on the representation of types in the system and the efficiency of type assertion checking; if a candidate argument combination can be compared to a function parameter list in linear time in the length of the list (\ie $k = 1$), then the $p^{k \cdot d}$ factor is linear in the input size of the source code for the expression, otherwise the resolution algorithm exibits sub-linear performance scaling on code containing more-deeply nested expressions. The number of valid interpretations of any subexpression, $i$, is bounded by the number of types in the system, which is possibly infinite, though practical resolution algorithms for \CFA must be able to place some finite bound on $i$, possibly at the expense of type-system completeness. -The research goal of this project is to develop a performant expression resolver for \CFA; this analysis suggests two primary areas of investigation to accomplish that end. -The first is efficient argument-parameter matching; Bilson\cite{Bilson03} mentions significant optimization opportunities available in the current literature to improve on the existing CFA compiler. +The research goal of this project is to develop a performant expression resolver for \CFA; this analysis suggests three primary areas of investigation to accomplish that end. +The first area of investigation is efficient argument-parameter matching; Bilson~\cite{Bilson03} mentions significant optimization opportunities available in the current literature to improve on the existing CFA compiler. %TODO: look up and lit review -The second, and likely more fruitful, area of investigation is heuristics and algorithmic approaches to reduce the number of argument interpretations considered in the common case; given the large ($p+1$) exponent on number of interpretations considered in the runtime analysis, even small reductions here could have a significant effect on overall resolver runtime. +The second area of investigation is minimizing dependencies between argument-parameter matches; the current CFA compiler attempts to match entire argument combinations against functions at once, potentially attempting to match the same argument against the same parameter multiple times. +Whether the feature set of \CFA admits an expression resolution algorithm where arguments can be matched to parameters independently of other arguments in the same function application is an area of open research; polymorphic type paramters produce enough of a cross-argument dependency that the problem is not trivial. +If cross-argument resolution dependencies cannot be completely eliminated, effective caching strategies to reduce duplicated work between equivalent argument-parameter matches in different combinations may mitigate the asymptotic defecits of the whole-combination matching approach. +The final area of investigation is heuristics and algorithmic approaches to reduce the number of argument interpretations considered in the common case; if argument-parameter matches cannot be made independent, even small reductions in $i$ should yield significant reductions in the $i^{p+1}$ resolver runtime factor. + The discussion below presents a number of largely orthagonal axes for expression resolution algorithm design to be investigated, noting prior work where applicable. +Though some of the proposed improvements to the expression resolution algorithm are based on heuristics rather than asymptoticly superior algorithms, it should be noted that user programmers often employ idioms and other programming patterns to reduce the mental burden of producing correct code, and if these patterns can be identified and exploited by the compiler then the significant reduction in expression resolution time for common, idiomatic expressions should result in lower total compilation time even for code including difficult-to-resolve expressions that push the expression resolver to its theoretical worst case. \subsection{Argument-Parameter Matching} -The first axis we consider is argument-parameter matching --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. - -\subsubsection{Argument-directed (``Bottom-up'')} -Baker's algorithm for expression resolution\cite{Baker82} pre-computes argument candidates, from the leaves of the expression tree up. +The first axis for consideration is argument-parameter matching direction --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. +All expression resolution algorithms form a DAG of interpretations, some explicitly, some implicitly; in this DAG, arcs point from function-call interpretations to argument interpretations, as below: +\begin{figure}[h] +\centering +\begin{subfigure}[h]{2in} +\begin{lstlisting} +int *p; // $p_i$ +char *p; // $p_c$ + +double *f(int*, int*); // $f_d$ +char *f(char*, char*); // $f_c$ + +f( f( p, p ), p ); +\end{lstlisting} +\end{subfigure}~\begin{subfigure}[h]{2in} +\includegraphics{resolution_dag} +\end{subfigure} +\caption{Resolution DAG for a simple expression. Functions that do not have a valid argument matching are covered with an \textsf{X}.}\label{fig:res_dag} +\end{figure} + +Note that some interpretations may be part of more than one super-interpretation, as with $p_i$ in the bottom row, while some valid subexpression interpretations, like $f_d$ in the middle row, are not used in any interpretation of their containing expression. + +\subsubsection{Argument-directed (Bottom-up)} +Baker's algorithm for expression resolution~\cite{Baker82} pre-computes argument candidates, from the leaves of the expression tree up. For each candidate function, Baker attempts to match argument types to parameter types in sequence, failing if any parameter cannot be matched. -Bilson\cite{Bilson03} similarly pre-computes argument candidates in the original \CFA compiler, but then explicitly enumerates all possible argument combinations for a multi-parameter function; these argument combinations are matched to the parameter types of the candidate function as a unit rather than individual arguments. -This is less efficient than Baker's approach, as the same argument may be compared to the same parameter many times, but allows a more straightforward handling of polymorphic type binding and multiple return types. -It is possible the efficiency losses here relative to Baker could be significantly reduced by application of memoization to the argument-parameter type comparisons. - -\subsubsection{Parameter-directed (``Top-down'')} -Unlike Baker and Bilson, Cormack's algorithm\cite{Cormack81} requests argument candidates which match the type of each parameter of each candidate function, from the top-level expression down; memoization of these requests is presented as an optimization. +Bilson~\cite{Bilson03} similarly pre-computes argument candidates in the original \CFA compiler, but then explicitly enumerates all possible argument combinations for a multi-parameter function; these argument combinations are matched to the parameter types of the candidate function as a unit rather than individual arguments. +This approach is less efficient than Baker's approach, as the same argument may be compared to the same parameter many times, but allows a more straightforward handling of polymorphic type-binding and multiple return-types. +It is possible the efficiency losses here relative to Baker could be significantly reduced by keeping a memoized cache of argument-parameter type comparisons and reading previously-seen argument-parameter matches from this cache rather than recomputing them. + +\subsubsection{Parameter-directed (Top-down)} +Unlike Baker and Bilson, Cormack's algorithm~\cite{Cormack81} requests argument candidates that match the type of each parameter of each candidate function, from the top-level expression down; memoization of these requests is presented as an optimization. As presented, this algorithm requires the result of the expression to have a known type, though an algorithm based on Cormack's could reasonably request a candidate set of any return type, though such a set may be quite large. \subsubsection{Hybrid} This proposal includes the investigation of hybrid top-down/bottom-up argument-parameter matching. -A reasonable hybrid approach might be to take a top-down approach when the expression to be matched is known to have a fixed type, and a bottom-up approach in untyped contexts. -This may include switches from one type to another at different levels of the expression tree, for instance: +A reasonable hybrid approach might take a top-down approach when the expression to be matched has a fixed type, and a bottom-up approach in untyped contexts. +This approach may involve switching from one type to another at different levels of the expression tree. +For instance: \begin{lstlisting} forall(otype T) @@ -315,10 +459,13 @@ int x = f( f( '!' ) ); \end{lstlisting} -Here, the outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach could be used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x© here, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner ©f©. The leaf expression ©'!'©, however, gives us a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©. - -Deciding when to switch between bottom-up and top-down resolution in a hybrid algorithm is a necessarily heuristic process, and though finding good heuristics for it is an open question, one reasonable approach might be to switch from top-down to bottom-up when the number of candidate functions exceeds some threshold. +The outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach is used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x©, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner call to ©f©. The leaf expression ©'!'©, however, determines a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©. + +Deciding when to switch between bottom-up and top-down resolution to minimize wasted work in a hybrid algorithm is a necessarily heuristic process, and though finding good heuristics for which subexpressions to swich matching strategies on is an open question, one reasonable approach might be to set a threshold $t$ for the number of candidate functions, and to use top-down resolution for any subexpression with fewer than $t$ candidate functions, to minimize the number of unmatchable argument interpretations computed, but to use bottom-up resolution for any subexpression with at least $t$ candidate functions, to reduce duplication in argument interpretation computation between the different candidate functions. + +\subsubsection{Common Subexpression Caching} +With any of these argument-parameter approaches, it may be a useful optimization to cache the resolution results for common subexpressions; in Figure~\ref{fig:res_dag} this optimization would result in the list of interpretations $[p_c, p_i]$ for ©p© only being calculated once, and re-used for each of the three instances of ©p©. \subsection{Implicit Conversion Application} -Baker's\cite{Baker82} and Cormack's\cite{Cormack81} algorithms do not account for implicit conversions\footnote{Baker does briefly comment on an approach for handling implicit conversions.}; both assume that there is at most one valid interpretation of a given expression for each distinct type. +Baker's and Cormack's algorithms do not account for implicit conversions\footnote{Baker does briefly comment on an approach for handling implicit conversions.}; both assume that there is at most one valid interpretation of a given expression for each distinct type. Integrating implicit conversion handling into their algorithms provides some choice of implementation approach. Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/Box.cc (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -104,5 +104,5 @@ Type *replaceWithConcrete( ApplicationExpr *appExpr, Type *type, bool doClone = true ); /// wraps a function application returning a polymorphic type with a new temporary for the out-parameter return value - Expression *addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg ); + Expression *addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg ); Expression *applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars ); void boxParam( Type *formal, Expression *&arg, const TyVarMap &exprTyVars ); @@ -661,5 +661,5 @@ // process polymorphic return value retval = 0; - if ( isPolyRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) { + if ( isDynRet( functionDecl->get_functionType() ) && functionDecl->get_linkage() == LinkageSpec::Cforall ) { retval = functionDecl->get_functionType()->get_returnVals().front(); @@ -868,7 +868,7 @@ } - Expression *Pass1::addPolyRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *polyType, std::list< Expression *>::iterator &arg ) { + Expression *Pass1::addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, ReferenceToType *dynType, std::list< Expression *>::iterator &arg ) { assert( env ); - Type *concrete = replaceWithConcrete( appExpr, polyType ); + Type *concrete = replaceWithConcrete( appExpr, dynType ); // add out-parameter for return value return addRetParam( appExpr, function, concrete, arg ); @@ -877,5 +877,6 @@ Expression *Pass1::applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) { Expression *ret = appExpr; - if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) { +// if ( ! function->get_returnVals().empty() && isPolyType( function->get_returnVals().front()->get_type(), tyVars ) ) { + if ( isDynRet( function, tyVars ) ) { ret = addRetParam( appExpr, function, function->get_returnVals().front()->get_type(), arg ); } // if @@ -968,5 +969,6 @@ // actually make the adapter type FunctionType *adapter = adaptee->clone(); - if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) { +// if ( ! adapter->get_returnVals().empty() && isPolyType( adapter->get_returnVals().front()->get_type(), tyVars ) ) { + if ( isDynRet( adapter, tyVars ) ) { makeRetParm( adapter ); } // if @@ -1030,5 +1032,6 @@ addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars ); bodyStmt = new ExprStmt( noLabels, adapteeApp ); - } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { +// } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { + } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { // return type T if ( (*param)->get_name() == "" ) { @@ -1277,8 +1280,8 @@ TyVarMap exprTyVars( (TypeDecl::Kind)-1 ); makeTyVarMap( function, exprTyVars ); - ReferenceToType *polyRetType = isPolyRet( function ); - - if ( polyRetType ) { - ret = addPolyRetParam( appExpr, function, polyRetType, arg ); + ReferenceToType *dynRetType = isDynRet( function, exprTyVars ); + + if ( dynRetType ) { + ret = addDynRetParam( appExpr, function, dynRetType, arg ); } else if ( needsAdapter( function, scopeTyVars ) ) { // std::cerr << "needs adapter: "; @@ -1290,5 +1293,5 @@ arg = appExpr->get_args().begin(); - passTypeVars( appExpr, polyRetType, arg, exprTyVars ); + passTypeVars( appExpr, dynRetType, arg, exprTyVars ); addInferredParams( appExpr, function, arg, exprTyVars ); @@ -1577,5 +1580,5 @@ // move polymorphic return type to parameter list - if ( isPolyRet( funcType ) ) { + if ( isDynRet( funcType ) ) { DeclarationWithType *ret = funcType->get_returnVals().front(); ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) ); Index: src/GenPoly/GenPoly.cc =================================================================== --- src/GenPoly/GenPoly.cc (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/GenPoly.cc (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -23,25 +23,4 @@ namespace GenPoly { - bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) { - if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { - return true; - } // if - for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) { - if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) { - return true; - } // if - } // for - return false; - } - - ReferenceToType *isPolyRet( FunctionType *function ) { - if ( ! function->get_returnVals().empty() ) { - TyVarMap forallTypes( (TypeDecl::Kind)-1 ); - makeTyVarMap( function, forallTypes ); - return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes ); - } // if - return 0; - } - namespace { /// Checks a parameter list for polymorphic parameters; will substitute according to env if present @@ -64,4 +43,14 @@ return false; } + + /// Checks a parameter list for dynamic-layout parameters from tyVars; will substitute according to env if present + bool hasDynParams( std::list< Expression* >& params, const TyVarMap &tyVars, const TypeSubstitution *env ) { + for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) { + TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param ); + assert(paramType && "Aggregate parameters should be type expressions"); + if ( isDynType( paramType->get_type(), tyVars, env ) ) return true; + } + return false; + } } @@ -101,4 +90,49 @@ } return 0; + } + + Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env ) { + type = replaceTypeInst( type, env ); + + if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) { + auto var = tyVars.find( typeInst->get_name() ); + if ( var != tyVars.end() && var->second == TypeDecl::Any ) { + return type; + } + } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) { + if ( hasDynParams( structType->get_parameters(), tyVars, env ) ) return type; + } else if ( UnionInstType *unionType = dynamic_cast< UnionInstType* >( type ) ) { + if ( hasDynParams( unionType->get_parameters(), tyVars, env ) ) return type; + } + return 0; + } + + ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &forallTypes ) { + if ( function->get_returnVals().empty() ) return 0; + + return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes ); + } + + ReferenceToType *isDynRet( FunctionType *function ) { + if ( function->get_returnVals().empty() ) return 0; + + TyVarMap forallTypes( (TypeDecl::Kind)-1 ); + makeTyVarMap( function, forallTypes ); + return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes ); + } + + bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) { +// if ( ! adaptee->get_returnVals().empty() && isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { +// return true; +// } // if + if ( isDynRet( adaptee, tyVars ) ) return true; + + for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) { +// if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) { + if ( isDynType( (*innerArg)->get_type(), tyVars ) ) { + return true; + } // if + } // for + return false; } Index: src/GenPoly/GenPoly.h =================================================================== --- src/GenPoly/GenPoly.h (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/GenPoly.h (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -31,11 +31,4 @@ namespace GenPoly { typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap; - - /// A function needs an adapter if it returns a polymorphic value or if any of its - /// parameters have polymorphic type - bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr ); - - /// true iff function has polymorphic return type - ReferenceToType *isPolyRet( FunctionType *function ); /// Replaces a TypeInstType by its referrent in the environment, if applicable @@ -47,4 +40,16 @@ /// returns polymorphic type if is polymorphic type in tyVars, NULL otherwise; will look up substitution in env if provided Type *isPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 ); + + /// returns dynamic-layout type if is dynamic-layout type in tyVars, NULL otherwise; will look up substitution in env if provided + Type *isDynType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 ); + + /// true iff function has dynamic-layout return type under the given type variable map + ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &tyVars ); + + /// true iff function has dynamic-layout return type under the type variable map generated from its forall-parameters + ReferenceToType *isDynRet( FunctionType *function ); + + /// A function needs an adapter if it returns a dynamic-layout value or if any of its parameters have dynamic-layout type + bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr ); /// returns polymorphic type if is pointer to polymorphic type, NULL otherwise; will look up substitution in env if provided Index: src/GenPoly/InstantiateGeneric.cc =================================================================== --- src/GenPoly/InstantiateGeneric.cc (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/InstantiateGeneric.cc (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -24,4 +24,5 @@ #include "GenPoly.h" #include "ScopedMap.h" +#include "ScopedSet.h" #include "ResolvExpr/typeops.h" @@ -122,4 +123,26 @@ } }; + + /// Possible options for a given specialization of a generic type + enum class genericType { + dtypeStatic, ///< Concrete instantiation based solely on {d,f}type-to-void conversions + concrete, ///< Concrete instantiation requiring at least one parameter type + dynamic ///< No concrete instantiation + }; + + genericType& operator |= ( genericType& gt, const genericType& ht ) { + switch ( gt ) { + case genericType::dtypeStatic: + gt = ht; + break; + case genericType::concrete: + if ( ht == genericType::dynamic ) { gt = genericType::dynamic; } + break; + case genericType::dynamic: + // nothing possible + break; + } + return gt; + } /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately @@ -127,9 +150,11 @@ /// Map of (generic type, parameter list) pairs to concrete type instantiations InstantiationMap< AggregateDecl, AggregateDecl > instantiations; + /// Set of types which are dtype-only generic (and therefore have static layout) + ScopedSet< AggregateDecl* > dtypeStatics; /// Namer for concrete types UniqueName typeNamer; public: - GenericInstantiator() : DeclMutator(), instantiations(), typeNamer("_conc_") {} + GenericInstantiator() : DeclMutator(), instantiations(), dtypeStatics(), typeNamer("_conc_") {} virtual Type* mutate( StructInstType *inst ); @@ -147,4 +172,7 @@ /// Wrap instantiation insertion for unions void insert( UnionInstType *inst, const std::list< TypeExpr* > &typeSubs, UnionDecl *decl ) { instantiations.insert( inst->get_baseUnion(), typeSubs, decl ); } + + /// Strips a dtype-static aggregate decl of its type parameters, marks it as stripped + void stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ); }; @@ -154,29 +182,6 @@ } - //////////////////////////////////////// GenericInstantiator ////////////////////////////////////////////////// - - /// Possible options for a given specialization of a generic type - enum class genericType { - dtypeStatic, ///< Concrete instantiation based solely on {d,f}type-to-void conversions - concrete, ///< Concrete instantiation requiring at least one parameter type - dynamic ///< No concrete instantiation - }; - - genericType& operator |= ( genericType& gt, const genericType& ht ) { - switch ( gt ) { - case genericType::dtypeStatic: - gt = ht; - break; - case genericType::concrete: - if ( ht == genericType::dynamic ) { gt = genericType::dynamic; } - break; - case genericType::dynamic: - // nothing possible - break; - } - return gt; - } - - /// Makes substitutions of params into baseParams; returns true if all parameters substituted for a concrete type + /// Makes substitutions of params into baseParams; returns dtypeStatic if there is a concrete instantiation based only on {d,f}type-to-void conversions, + /// concrete if there is a concrete instantiation requiring at least one parameter type, and dynamic if there is no concrete instantiation genericType makeSubstitutions( const std::list< TypeDecl* >& baseParams, const std::list< Expression* >& params, std::list< TypeExpr* >& out ) { genericType gt = genericType::dtypeStatic; @@ -223,4 +228,28 @@ } + /// Substitutes types of members according to baseParams => typeSubs, working in-place + void substituteMembers( std::list< Declaration* >& members, const std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) { + // substitute types into new members + TypeSubstitution subs( baseParams.begin(), baseParams.end(), typeSubs.begin() ); + for ( std::list< Declaration* >::iterator member = members.begin(); member != members.end(); ++member ) { + subs.apply(*member); + } + } + + /// Strips the instances's type parameters + void stripInstParams( ReferenceToType *inst ) { + deleteAll( inst->get_parameters() ); + inst->get_parameters().clear(); + } + + void GenericInstantiator::stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) { + substituteMembers( base->get_members(), baseParams, typeSubs ); + + deleteAll( baseParams ); + baseParams.clear(); + + dtypeStatics.insert( base ); + } + Type* GenericInstantiator::mutate( StructInstType *inst ) { // mutate subtypes @@ -231,13 +260,22 @@ // exit early if no need for further mutation if ( inst->get_parameters().empty() ) return inst; + + // check for an already-instantiatiated dtype-static type + if ( dtypeStatics.find( inst->get_baseStruct() ) != dtypeStatics.end() ) { + stripInstParams( inst ); + return inst; + } + + // check if type can be concretely instantiated; put substitutions into typeSubs assert( inst->get_baseParameters() && "Base struct has parameters" ); - - // check if type can be concretely instantiated; put substitutions into typeSubs std::list< TypeExpr* > typeSubs; genericType gt = makeSubstitutions( *inst->get_baseParameters(), inst->get_parameters(), typeSubs ); switch ( gt ) { - case genericType::dtypeStatic: // TODO strip params off original decl and reuse here - case genericType::concrete: - { + case genericType::dtypeStatic: + stripDtypeParams( inst->get_baseStruct(), *inst->get_baseParameters(), typeSubs ); + stripInstParams( inst ); + break; + + case genericType::concrete: { // make concrete instantiation of generic type StructDecl *concDecl = lookup( inst, typeSubs ); @@ -274,11 +312,21 @@ // exit early if no need for further mutation if ( inst->get_parameters().empty() ) return inst; + + // check for an already-instantiatiated dtype-static type + if ( dtypeStatics.find( inst->get_baseUnion() ) != dtypeStatics.end() ) { + stripInstParams( inst ); + return inst; + } + + // check if type can be concretely instantiated; put substitutions into typeSubs assert( inst->get_baseParameters() && "Base union has parameters" ); - - // check if type can be concretely instantiated; put substitutions into typeSubs std::list< TypeExpr* > typeSubs; genericType gt = makeSubstitutions( *inst->get_baseParameters(), inst->get_parameters(), typeSubs ); switch ( gt ) { - case genericType::dtypeStatic: // TODO strip params off original decls and reuse here + case genericType::dtypeStatic: + stripDtypeParams( inst->get_baseUnion(), *inst->get_baseParameters(), typeSubs ); + stripInstParams( inst ); + break; + case genericType::concrete: { @@ -311,4 +359,5 @@ DeclMutator::doBeginScope(); instantiations.beginScope(); + dtypeStatics.beginScope(); } @@ -316,4 +365,5 @@ DeclMutator::doEndScope(); instantiations.endScope(); + dtypeStatics.endScope(); } Index: src/GenPoly/ScrubTyVars.cc =================================================================== --- src/GenPoly/ScrubTyVars.cc (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/ScrubTyVars.cc (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -45,5 +45,5 @@ Type * ScrubTyVars::mutateAggregateType( Type *ty ) { - if ( isPolyType( ty, tyVars ) ) { + if ( shouldScrub( ty ) ) { PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) ); delete ty; @@ -63,6 +63,6 @@ Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) { // sizeof( T ) => _sizeof_T parameter, which is the size of T - if ( Type *polyType = isPolyType( szeof->get_type() ) ) { - Expression *expr = new NameExpr( sizeofName( mangleType( polyType ) ) ); + if ( Type *dynType = shouldScrub( szeof->get_type() ) ) { + Expression *expr = new NameExpr( sizeofName( mangleType( dynType ) ) ); return expr; } else { @@ -73,6 +73,6 @@ Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) { // alignof( T ) => _alignof_T parameter, which is the alignment of T - if ( Type *polyType = isPolyType( algnof->get_type() ) ) { - Expression *expr = new NameExpr( alignofName( mangleType( polyType ) ) ); + if ( Type *dynType = shouldScrub( algnof->get_type() ) ) { + Expression *expr = new NameExpr( alignofName( mangleType( dynType ) ) ); return expr; } else { @@ -82,6 +82,19 @@ Type * ScrubTyVars::mutate( PointerType *pointer ) { - if ( Type *polyType = isPolyType( pointer->get_base(), tyVars ) ) { - Type *ret = polyType->acceptMutator( *this ); +// // special case of shouldScrub that takes all TypeInstType pointer bases, even if they're not dynamic +// Type *base = pointer->get_base(); +// Type *dynType = 0; +// if ( dynamicOnly ) { +// if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( base ) ) { +// if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { dynType = typeInst; } +// } else { +// dynType = isDynType( base, tyVars ); +// } +// } else { +// dynType = isPolyType( base, tyVars ); +// } +// if ( dynType ) { + if ( Type *dynType = shouldScrub( pointer->get_base() ) ) { + Type *ret = dynType->acceptMutator( *this ); ret->get_qualifiers() += pointer->get_qualifiers(); pointer->set_base( 0 ); Index: src/GenPoly/ScrubTyVars.h =================================================================== --- src/GenPoly/ScrubTyVars.h (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/GenPoly/ScrubTyVars.h (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -27,5 +27,5 @@ class ScrubTyVars : public Mutator { public: - ScrubTyVars( const TyVarMap &tyVars ): tyVars( tyVars ) {} + ScrubTyVars( const TyVarMap &tyVars, bool dynamicOnly = false ): tyVars( tyVars ), dynamicOnly( dynamicOnly ) {} /// For all polymorphic types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type, @@ -33,4 +33,9 @@ template< typename SynTreeClass > static SynTreeClass *scrub( SynTreeClass *target, const TyVarMap &tyVars ); + + /// For all dynamic-layout types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type, + /// and sizeof/alignof expressions with the proper variable + template< typename SynTreeClass > + static SynTreeClass *scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ); virtual Type* mutate( TypeInstType *typeInst ); @@ -42,14 +47,32 @@ private: + /// Returns the type if it should be scrubbed, NULL otherwise. + Type* shouldScrub( Type *ty ) { + return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars ); +// if ( ! dynamicOnly ) return isPolyType( ty, tyVars ); +// +// if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) { +// return tyVars.find( typeInst->get_name() ) != tyVars.end() ? ty : 0; +// } +// +// return isDynType( ty, tyVars ); + } + /// Mutates (possibly generic) aggregate types appropriately Type* mutateAggregateType( Type *ty ); - const TyVarMap &tyVars; + const TyVarMap &tyVars; ///< Type variables to scrub + bool dynamicOnly; ///< only scrub the types with dynamic layout? [false] }; - /* static class method */ template< typename SynTreeClass > SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) { ScrubTyVars scrubber( tyVars ); + return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) ); + } + + template< typename SynTreeClass > + SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) { + ScrubTyVars scrubber( tyVars, true ); return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) ); } Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/SymTab/Autogen.cc (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -174,7 +174,7 @@ void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, TypeSubstitution & genericSubs, bool isDynamicLayout, bool forward = true ) { - if ( isDynamicLayout && src ) { - genericSubs.apply( src ); - } +// if ( isDynamicLayout && src ) { +// genericSubs.apply( src ); +// } ObjectDecl * returnVal = NULL; Index: src/examples/gc_no_raii/src/gc.h =================================================================== --- src/examples/gc_no_raii/src/gc.h (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/examples/gc_no_raii/src/gc.h (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -7,9 +7,15 @@ static inline gcpointer(T) gcmalloc() { - gcpointer(T) ptr; - void* address = gc_allocate(sizeof(T)); - (&ptr){ address }; - ctor(&ptr, address); + gcpointer(T) ptr = { gc_allocate(sizeof(T)) }; + ptr{}; gc_conditional_collect(); return ptr; } + +forall(otype T) +static inline void gcmalloc(gcpointer(T)* ptr) +{ + ptr{ gc_allocate(sizeof(T)) }; + (*ptr){}; + gc_conditional_collect(); +} Index: src/examples/gc_no_raii/test/gctest.c =================================================================== --- src/examples/gc_no_raii/test/gctest.c (revision 321f55dd97b62c0225eb83e07dfecef26a7154d2) +++ src/examples/gc_no_raii/test/gctest.c (revision 27fefeb6607aa2617cb96cc62575c69874d7bab5) @@ -8,4 +8,7 @@ sout | "Bonjour au monde!\n"; - gcpointer(int) anInt = gcmalloc(); + for(int i = 0; i < 1000000; i++) { + gcpointer(int) anInt; + gcmalloc(&anInt); + } }