Changeset 9236060 for src/CodeGen/CodeGenerator.cc

Timestamp:

Aug 14, 2017, 2:03:39 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

74b007ba

Parents:

fd344aa (diff), 54cd58b (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' into references

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 16:00:00 2017
-// Update Count     : 485
+// Last Modified On : Tus Jul 25 15:29:00 2017
+// Update Count     : 486
 //
+#include "CodeGenerator.h"
 
 #include <cassert>                   // for assert, assertf
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "CodeGenerator.h"
 #include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
@@ -556 +556 @@
                         // never an lvalue in C
                 } // if
+                castExpr->get_arg()->accept( *this );
+                output << ")";
+        }
+
+        void CodeGenerator::visit( VirtualCastExpr * castExpr ) {
+                assertf( ! genC, "VirtualCastExpr should not reach code generation." );
+                extension( castExpr );
+                output << "(virtual ";
                 castExpr->get_arg()->accept( *this );
                 output << ")";