Changeset cff1143 for src/CodeGen

Timestamp:

Jul 9, 2015, 3:07:32 PM (9 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:

0215a76f, dfee306

Parents:

82dd287 (diff), e5609dd (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/GenType.cc (modified) (2 diffs)

src/CodeGen/GenType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:36:02 2015
-// Update Count     : 9
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:08:24 2015
+// Update Count     : 10
 //
 
@@ -93 +93 @@
                         os << "_Atomic ";
                 } // if
-                if ( isVarLen ) {
-                        os << "*";
-                } // if
                 if ( dimension != 0 ) {
                         CodeGenerator cg( os );
                         dimension->accept( cg );
+                } else if ( isVarLen ) {
+                        // no dimension expression on a VLA
+                        // means it came in with the * token
+                        os << "*";
                 } // if
                 os << "]";