Changeset 2a301ff for src/SymTab/FixFunction.cc

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/SymTab/FixFunction.cc (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -109 +109 @@
 
                 const ast::DeclWithType * postvisit( const ast::FunctionDecl * func ) {
-                        return new ast::ObjectDecl{ 
-                                func->location, func->name, new ast::PointerType{ func->type }, nullptr, 
+                        // Cannot handle cases with asserions.
+                        assert( func->assertions.empty() );
+                        return new ast::ObjectDecl{
+                                func->location, func->name, new ast::PointerType( func->type ), nullptr,
                                 func->storage, func->linkage, nullptr, copy( func->attributes ) };
                 }
@@ -117 +119 @@
 
                 const ast::Type * postvisit( const ast::ArrayType * array ) {
-                        return new ast::PointerType{ 
-                                array->base, array->dimension, array->isVarLen, array->isStatic, 
+                        return new ast::PointerType{
+                                array->base, array->dimension, array->isVarLen, array->isStatic,
                                 array->qualifiers };
                 }