Changeset c6c6f2ae


Ignore:
Timestamp:
Aug 15, 2017, 1:43:00 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    rbd098ea rc6c6f2ae  
    941941        void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
    942942                if ( sizeofExpr->get_isType() ) {
    943                         // xxx - resolveTypeof?
    944                         alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
     943                        Type * newType = sizeofExpr->get_type()->clone();
     944                        alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
    945945                } else {
    946946                        // find all alternatives for the argument to sizeof
     
    961961        void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
    962962                if ( alignofExpr->get_isType() ) {
    963                         // xxx - resolveTypeof?
    964                         alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
     963                        Type * newType = alignofExpr->get_type()->clone();
     964                        alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
    965965                } else {
    966966                        // find all alternatives for the argument to sizeof
Note: See TracChangeset for help on using the changeset viewer.