Changeset dd33c1f for src/ResolvExpr

Timestamp:

Jul 26, 2022, 2:17:49 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

1b97cc87

Parents:

4c48be0 (diff), 3992098 (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

@@ -1542 +1542 @@
         }
 
-
         const ast::StaticAssertDecl * Resolver_new::previsit(
                 const ast::StaticAssertDecl * assertDecl
@@ -1554 +1553 @@
         const PtrType * handlePtrType( const PtrType * type, const ResolveContext & context ) {
                 if ( type->dimension ) {
-                        ast::ptr< ast::Type > sizeType = context.global.sizeType;
+                        const ast::Type * sizeType = context.global.sizeType.get();
                         ast::ptr< ast::Expr > dimension = findSingleExpression( type->dimension, sizeType, context );
                         assertf(dimension->env->empty(), "array dimension expr has nonempty env");
                         dimension.get_and_mutate()->env = nullptr;
-                        ast::mutate_field(
-                                type, &PtrType::dimension,
-                                dimension);
+                        ast::mutate_field( type, &PtrType::dimension, dimension );
                 }
                 return type;