Changeset c6c6f2ae

Timestamp:

Aug 15, 2017, 1:43:00 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3f27b9a

Parents:

bd098ea (diff), 322b97e (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

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -941 +941 @@
         void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
                 if ( sizeofExpr->get_isType() ) {
-                        // xxx - resolveTypeof?
-                        alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
+                        Type * newType = sizeofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
                 } else {
                         // find all alternatives for the argument to sizeof
@@ -961 +961 @@
         void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
                 if ( alignofExpr->get_isType() ) {
-                        // xxx - resolveTypeof?
-                        alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
+                        Type * newType = alignofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
                 } else {
                         // find all alternatives for the argument to sizeof