Changeset dbc733e for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Sep 1, 2017, 9:53:19 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f43df73

Parents:

ba2a68b (diff), b0dfbc4 (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 plg2:software/cfa/cfa-cc

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -698 +698 @@
 
         void AlternativeFinder::visit( UntypedExpr *untypedExpr ) {
-                {
-                        std::string fname = InitTweak::getFunctionName( untypedExpr );
-                        if ( fname == "&&" ) {
-                                VoidType v = Type::Qualifiers();                // resolve to type void *
-                                PointerType pt( Type::Qualifiers(), v.clone() );
-                                UntypedExpr *vexpr = untypedExpr->clone();
-                                vexpr->set_result( pt.clone() );
-                                alternatives.push_back( Alternative( vexpr, env, Cost::zero) );
-                                return;
-                        }
-                }
-
                 AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( untypedExpr->get_function() );
@@ -856 +844 @@
                         } // if
                 } // for
+        }
+
+        void AlternativeFinder::visit( LabelAddressExpr * expr ) {
+                alternatives.push_back( Alternative( expr->clone(), env, Cost::zero) );
         }