- Timestamp:
- Dec 10, 2020, 4:00:29 PM (4 years ago)
- Branches:
- ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- 97aca3d, b3a0df6
- Parents:
- 6a45bd78 (diff), 297cf18 (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. - Location:
- src
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/AST/module.mk
r6a45bd78 r3e3f236 59 59 AST/SymbolTable.cpp \ 60 60 AST/SymbolTable.hpp \ 61 AST/TranslationUnit.hpp \ 61 62 AST/Type.cpp \ 62 63 AST/Type.hpp \ -
src/Common/module.mk
r6a45bd78 r3e3f236 18 18 Common/Assert.cc \ 19 19 Common/CodeLocation.h \ 20 Common/CodeLocationTools.hpp \ 21 Common/CodeLocationTools.cpp \ 20 22 Common/CompilerError.h \ 21 23 Common/Debug.h \ -
src/main.cc
r6a45bd78 r3e3f236 10 10 // Created On : Fri May 15 23:12:02 2015 11 11 // Last Modified By : Andrew Beach 12 // Last Modified On : Tue Dec 1 14:52:00 202013 // Update Count : 63 812 // Last Modified On : Mon Dec 7 15:29:00 2020 13 // Update Count : 639 14 14 // 15 15 … … 40 40 #include "CodeTools/ResolvProtoDump.h" // for dumpAsResolvProto 41 41 #include "CodeTools/TrackLoc.h" // for fillLocations 42 #include "Common/CodeLocationTools.hpp" // for forceFillCodeLocations 42 43 #include "Common/CompilerError.h" // for CompilerError 43 44 #include "Common/Stats.h" … … 353 354 } // if 354 355 355 // TODO: This is a quick fix to get the build working. 356 // Get rid of fillLocations or at least make a new-ast version. 357 translationUnit = convert( move( transUnit ) ); 358 CodeTools::fillLocations( translationUnit ); 359 transUnit = convert( move( translationUnit ) ); 356 forceFillCodeLocations( transUnit ); 360 357 361 358 PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
Note: See TracChangeset
for help on using the changeset viewer.