Changeset 413f7f8 for src/CodeGen

Timestamp:

Jul 7, 2015, 1:49:58 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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

File:

• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:11:41 2015
-// Update Count     : 143
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jun 26 16:52:58 2015
+// Update Count     : 144
 //
 
@@ -269 +269 @@
               
                                   case OT_CONSTANT:
-                                        // there are no intrinsic definitions of 0 or 1 as functions
+                                  case OT_LABELADDRESS:
+                                        // there are no intrinsic definitions of 0/1 or label addresses as functions
                                         assert( false );
                                 }