Changeset 85517ddb


Ignore:
Timestamp:
Sep 3, 2016, 9:04:40 AM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, 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:
1ba88a0
Parents:
44f6341
Message:

resolve typeof in cast expressions, update typeof test

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    r44f6341 r85517ddb  
    4242#include "Common/utility.h"
    4343#include "InitTweak/InitTweak.h"
     44#include "ResolveTypeof.h"
    4445
    4546extern bool resolvep;
     
    707708        void AlternativeFinder::visit( CastExpr *castExpr ) {
    708709                for ( std::list< Type* >::iterator i = castExpr->get_results().begin(); i != castExpr->get_results().end(); ++i ) {
     710                        *i = resolveTypeof( *i, indexer );
    709711                        SymTab::validateType( *i, &indexer );
    710712                        adjustExprType( *i, env, indexer );
     
    795797
    796798        void AlternativeFinder::visit( VariableExpr *variableExpr ) {
    797                 alternatives.push_back( Alternative( variableExpr->clone(), env, Cost::zero ) );
     799                // not sufficient to clone here, because variable's type may have changed
     800                // since the VariableExpr was originally created.
     801                alternatives.push_back( Alternative( new VariableExpr( variableExpr->get_var() ), env, Cost::zero ) );
    798802        }
    799803
     
    804808        void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
    805809                if ( sizeofExpr->get_isType() ) {
     810                        // xxx - resolveTypeof?
    806811                        alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
    807812                } else {
     
    823828        void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
    824829                if ( alignofExpr->get_isType() ) {
     830                        // xxx - resolveTypeof?
    825831                        alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
    826832                } else {
     
    856862        void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
    857863                AlternativeFinder funcFinder( indexer, env );
     864                // xxx - resolveTypeof?
    858865                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
    859866                        addOffsetof( structInst, offsetofExpr->get_member() );
  • src/tests/typeof.c

    r44f6341 r85517ddb  
    88    typeof( int ( int, int p ) ) *v7;
    99    typeof( [int] ( int, int p ) ) *v8;
     10    (typeof(v1)) v2; // cast with typeof
    1011}
Note: See TracChangeset for help on using the changeset viewer.