Changeset 5684736

Timestamp:

Jun 6, 2019, 5:46:14 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

4e5e6cc, 60aaa51d, 866545b, 9151fcb

Parents:

2b59f55 (diff), 7cc0344 (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:

• AST/AssertAcyclic.cpp (added)
• AST/AssertAcyclic.hpp (added)
• AST/module.mk (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

src/AST/module.mk

@@ -16 +16 @@
 
 SRC_AST = \
+        AST/AssertAcyclic.cpp \
         AST/Attribute.cpp \
         AST/Convert.cpp \

src/Makefile.in

@@ -165 +165 @@
 libdemangle_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \
-        AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \
-        AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \
-        AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
-        AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
-        AST/Stmt.$(OBJEXT) AST/SymbolTable.$(OBJEXT) \
-        AST/Type.$(OBJEXT) AST/TypeEnvironment.$(OBJEXT) \
-        AST/TypeSubstitution.$(OBJEXT)
+am__objects_1 = AST/AssertAcyclic.$(OBJEXT) AST/Attribute.$(OBJEXT) \
+        AST/Convert.$(OBJEXT) AST/Decl.$(OBJEXT) \
+        AST/DeclReplacer.$(OBJEXT) AST/Expr.$(OBJEXT) \
+        AST/GenericSubstitution.$(OBJEXT) AST/Init.$(OBJEXT) \
+        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
+        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
+        AST/SymbolTable.$(OBJEXT) AST/Type.$(OBJEXT) \
+        AST/TypeEnvironment.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
         CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
@@ -577 +577 @@
 @WITH_LIBTCMALLOC_TRUE@TCMALLOCFLAG = -DTCMALLOC
 SRC_AST = \
+        AST/AssertAcyclic.cpp \
         AST/Attribute.cpp \
         AST/Convert.cpp \
@@ -744 +745 @@
         @$(MKDIR_P) AST/$(DEPDIR)
         @: > AST/$(DEPDIR)/$(am__dirstamp)
+AST/AssertAcyclic.$(OBJEXT): AST/$(am__dirstamp) \
+        AST/$(DEPDIR)/$(am__dirstamp)
 AST/Attribute.$(OBJEXT): AST/$(am__dirstamp) \
         AST/$(DEPDIR)/$(am__dirstamp)
@@ -1193 +1196 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MakeLibCfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/AssertAcyclic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Attribute.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Convert.Po@am__quote@