Changeset d6089ad


Ignore:
Timestamp:
Dec 7, 2020, 3:51:59 PM (11 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
0f7a0ea, c9e0991
Parents:
58870e6b (diff), f57faf6 (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:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/Common/module.mk

    r58870e6b rd6089ad  
    1818      Common/Assert.cc \
    1919      Common/CodeLocation.h \
     20      Common/CodeLocationTools.hpp \
     21      Common/CodeLocationTools.cpp \
    2022      Common/CompilerError.h \
    2123      Common/Debug.h \
  • src/main.cc

    r58870e6b rd6089ad  
    1010// Created On       : Fri May 15 23:12:02 2015
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Tue Dec  1 14:52:00 2020
    13 // Update Count     : 638
     12// Last Modified On : Mon Dec  7 15:29:00 2020
     13// Update Count     : 639
    1414//
    1515
     
    4040#include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
    4141#include "CodeTools/TrackLoc.h"             // for fillLocations
     42#include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
    4243#include "Common/CompilerError.h"           // for CompilerError
    4344#include "Common/Stats.h"
     
    353354                        } // if
    354355
    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 );
    360357
    361358                        PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
Note: See TracChangeset for help on using the changeset viewer.