Changeset 5fda7143 for src/ResolvExpr

Timestamp:

Sep 7, 2016, 9:30:25 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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:

9f70ab57

Parents:

1f75e2d (diff), f04a8b81 (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

Conflicts:

src/Common/utility.h

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (6 diffs)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -42 +42 @@
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
+#include "ResolveTypeof.h"
 
 extern bool resolvep;
@@ -707 +708 @@
         void AlternativeFinder::visit( CastExpr *castExpr ) {
                 for ( std::list< Type* >::iterator i = castExpr->get_results().begin(); i != castExpr->get_results().end(); ++i ) {
+                        *i = resolveTypeof( *i, indexer );
                         SymTab::validateType( *i, &indexer );
                         adjustExprType( *i, env, indexer );
@@ -795 +797 @@
 
         void AlternativeFinder::visit( VariableExpr *variableExpr ) {
-                alternatives.push_back( Alternative( variableExpr->clone(), env, Cost::zero ) );
+                // not sufficient to clone here, because variable's type may have changed
+                // since the VariableExpr was originally created.
+                alternatives.push_back( Alternative( new VariableExpr( variableExpr->get_var() ), env, Cost::zero ) );
         }
 
@@ -804 +808 @@
         void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
                 if ( sizeofExpr->get_isType() ) {
+                        // xxx - resolveTypeof?
                         alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
                 } else {
@@ -823 +828 @@
         void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
                 if ( alignofExpr->get_isType() ) {
+                        // xxx - resolveTypeof?
                         alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
                 } else {
@@ -856 +862 @@
         void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
+                // xxx - resolveTypeof?
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
                         addOffsetof( structInst, offsetofExpr->get_member() );

src/ResolvExpr/Resolver.cc

@@ -528 +528 @@
 
         void Resolver::visit( ConstructorInit *ctorInit ) {
-                try {
-                        maybeAccept( ctorInit->get_ctor(), *this );
-                        maybeAccept( ctorInit->get_dtor(), *this );
-                } catch ( SemanticError ) {
-                        // no alternatives for the constructor initializer - fallback on C-style initializer
-                        // xxx - not sure if this makes a ton of sense - should maybe never be able to have this situation?
-                        fallbackInit( ctorInit );
-                        return;
-                }
+                // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
+                maybeAccept( ctorInit->get_ctor(), *this );
+                maybeAccept( ctorInit->get_dtor(), *this );
 
                 // found a constructor - can get rid of C-style initializer