Changeset 1048b31 for src/GenPoly/ScrubTyVars.cc

Timestamp:

May 2, 2016, 3:28:16 PM (10 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, stuck-waitfor-destruct, with_gc

Children:

1b7ea43

Parents:

1f6e009 (diff), e945826 (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 global-init

File:

• src/GenPoly/ScrubTyVars.cc (modified) (2 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -64 +64 @@
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
                 if ( Type *polyType = isPolyType( szeof->get_type() ) ) {
-                        Expression *expr = new NameExpr( sizeofName( polyType ) );
+                        Expression *expr = new NameExpr( sizeofName( mangleType( polyType ) ) );
                         return expr;
                 } else {
@@ -74 +74 @@
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
                 if ( Type *polyType = isPolyType( algnof->get_type() ) ) {
-                        Expression *expr = new NameExpr( alignofName( polyType ) );
+                        Expression *expr = new NameExpr( alignofName( mangleType( polyType ) ) );
                         return expr;
                 } else {