Changes in src/ResolvExpr/Resolver.cc [12df6fe:9feb34b]

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -38 +38 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
+#include "Common/Eval.h"                 // for eval
+#include "Common/Iterate.hpp"            // for group_iterate
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
-#include "Common/utility.h"              // for ValueGuard, group_iterate
+#include "Common/ToString.hpp"           // for toCString
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt
@@ -1542 +1544 @@
         }
 
-
         const ast::StaticAssertDecl * Resolver_new::previsit(
                 const ast::StaticAssertDecl * assertDecl
@@ -1554 +1555 @@
         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;