Changeset 02a43ff for src

Timestamp:

May 17, 2021, 9:29:43 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c2794b2

Parents:

6312b1c (diff), 1eb222ff (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/Virtual/ExpandCasts.cc (modified) (2 diffs)

src/Virtual/ExpandCasts.cc

@@ -105 +105 @@
         void VirtualCastCore::premutate( FunctionDecl * functionDecl ) {
                 if ( (! vcast_decl) &&
-                     functionDecl->get_name() == "__cfa__virtual_cast" ) {
+                     functionDecl->get_name() == "__cfavir_virtual_cast" ) {
                         vcast_decl = functionDecl;
                 }
@@ -113 +113 @@
                 if ( pvt_decl || ! structDecl->has_body() ) {
                         return;
-                } else if ( structDecl->get_name() == "__cfa__parent_vtable" ) {
+                } else if ( structDecl->get_name() == "__cfavir_type_info" ) {
                         pvt_decl = structDecl;
                 }