Changeset d6089ad

Timestamp:

Dec 7, 2020, 3:51:59 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

0f7a0ea, c9e0991

Parents:

58870e6b (diff), f57faf6f (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:

• Common/CodeLocationTools.cpp (added)
• Common/CodeLocationTools.hpp (added)
• Common/module.mk (modified) (1 diff)
• main.cc (modified) (3 diffs)

src/Common/module.mk

@@ -18 +18 @@
       Common/Assert.cc \
       Common/CodeLocation.h \
+      Common/CodeLocationTools.hpp \
+      Common/CodeLocationTools.cpp \
       Common/CompilerError.h \
       Common/Debug.h \

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Dec  1 14:52:00 2020
-// Update Count     : 638
+// Last Modified On : Mon Dec  7 15:29:00 2020
+// Update Count     : 639
 //
 
@@ -40 +40 @@
 #include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
 #include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Common/CompilerError.h"           // for CompilerError
 #include "Common/Stats.h"
@@ -353 +354 @@
                         } // 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 ) );
+                        forceFillCodeLocations( transUnit );
 
                         PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));