Changeset a25f64b

Timestamp:

Dec 2, 2020, 12:11:01 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

833ba13, f0d67e5

Parents:

2b2f59d (diff), 4a8f150 (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

Location:

src

Files:

• InitTweak/FixInitNew.cpp (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• main.cc (modified) (3 diffs)

src/InitTweak/FixInitNew.cpp

@@ -413 +413 @@
         void SelfAssignChecker::previsit( const ast::ApplicationExpr * appExpr ) {
                 auto function = getFunction( appExpr );
-                if ( function->name == "?=?" ) { // doesn't use isAssignment, because ?+=?, etc. should not count as self-assignment
-                        if ( appExpr->args.size() == 2 ) {
-                                // check for structural similarity (same variable use, ignore casts, etc. - but does not look too deeply, anything looking like a function is off limits)
-                                if ( structurallySimilar( appExpr->args.front(), appExpr->args.back() ) ) {
-                                        SemanticWarning( appExpr->location, Warning::SelfAssignment, toCString( appExpr->args.front() ) );
-                                }
-                        }
+                // Doesn't use isAssignment, because ?+=?, etc. should not count as self-assignment.
+                if ( function->name == "?=?" && appExpr->args.size() == 2
+                                // Check for structural similarity (same variable use, ignore casts, etc.
+                                // (but does not look too deeply, anything looking like a function is off limits).
+                                && structurallySimilar( appExpr->args.front(), appExpr->args.back() ) ) {
+                        SemanticWarning( appExpr->location, Warning::SelfAssignment, toCString( appExpr->args.front() ) );
                 }
         }

src/ResolvExpr/Resolver.cc

@@ -1471 +1471 @@
                                 auto newDecl = fixObjectType(objectDecl, symtab);
                                 auto mutDecl = mutate(newDecl);
-                                
+
                                 // generate CtorInit wrapper when necessary.
                                 // in certain cases, fixObjectType is called before reaching
@@ -1489 +1489 @@
                         currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };
                 }
-                
+
                 return objectDecl;
         }

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct  8 18:17:46 2020
-// Update Count     : 637
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Dec  1 14:52:00 2020
+// Update Count     : 638
 //
 
@@ -340 +340 @@
                 } // if
 
-                if( useNewAST) {
+                if( useNewAST ) {
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -352 +352 @@
                                 return EXIT_SUCCESS;
                         } // if
+
+                        // TODO: This is a quick fix to get the build working.
+                        // Get rid of fillLocations or at least make a new-ast version.
+                        translationUnit = convert( move( transUnit ) );
+                        CodeTools::fillLocations( translationUnit );
+                        transUnit = convert( move( translationUnit ) );
 
                         PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));