Changeset 189243c for src/GenPoly

Timestamp:

May 13, 2016, 2:55:44 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

2b46a13, a8616147

Parents:

102b0cd (diff), cc3528f (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' into ctor

Conflicts:

src/GenPoly/Box.cc

File:

• src/GenPoly/Box.cc (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue May 03 16:44:47 2016
+// Last Modified On : Fri May 13 14:51:21 2016
 // Update Count     : 295
 //
@@ -1037 +1037 @@
                         std::list< DeclarationWithType *>::iterator param = adapterType->get_parameters().begin();
                         std::list< DeclarationWithType *>::iterator realParam = adaptee->get_parameters().begin();
-                        param++;                // skip adaptee parameter
+                        param++;                // skip adaptee parameter in the adapter type
                         if ( realType->get_returnVals().empty() ) {
+                                // void return
                                 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 ) ) {
+                                // return type T
                                 if ( (*param)->get_name() == "" ) {
                                         (*param)->set_name( "_ret" );
@@ -2069 +2071 @@
                                 if ( n_members == 0 ) {
                                         // all empty structs have the same layout - size 1, align 1
-                                        makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
-                                        makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
+                                        makeVar( sizeofName( typeName ), layoutType, new SingleInit( new ConstantExpr( Constant::from_ulong( (unsigned long)1 ) ) ) );
+                                        makeVar( alignofName( typeName ), layoutType->clone(), new SingleInit( new ConstantExpr( Constant::from_ulong( (unsigned long)1 ) ) ) );
                                         // NOTE zero-length arrays are forbidden in C, so empty structs have no offsetof array
                                 } else {