Changeset 833ba13 for src/ResolvExpr/Resolver.cc

Timestamp:

Dec 2, 2020, 12:31:56 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

ddcedfe

Parents:

3d0560d (diff), a25f64b (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/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -1471 +1471 @@
                                 auto newDecl = fixObjectType(objectDecl, symtab);
                                 auto mutDecl = mutate(newDecl);
-                                
+
                                 // generate CtorInit wrapper when necessary.
                                 // in certain cases, fixObjectType is called before reaching
@@ -1489 +1489 @@
                         currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };
                 }
-                
+
                 return objectDecl;
         }