Changeset dd33c1f for src/AST

Timestamp:

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

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

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

Location:

src/AST

Files:

• Decl.hpp (modified) (3 diffs)
• Pass.impl.hpp (modified) (2 diffs)

src/AST/Decl.hpp

@@ -108 +108 @@
         ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,
                 const Init * init = nullptr, Storage::Classes storage = {},
-                Linkage::Spec linkage = Linkage::C, const Expr * bitWd = nullptr,
+                Linkage::Spec linkage = Linkage::Cforall, const Expr * bitWd = nullptr,
                 std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
         : DeclWithType( loc, name, storage, linkage, std::move(attrs), fs ), type( type ),
@@ -143 +143 @@
         FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
-                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C,
+                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {}, bool isVarArgs = false);
 
@@ -149 +149 @@
                 std::vector<ptr<TypeDecl>>&& forall, std::vector<ptr<DeclWithType>>&& assertions,
                 std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
-                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::C,
+                CompoundStmt * stmts, Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector<ptr<Attribute>>&& attrs = {}, Function::Specs fs = {}, bool isVarArgs = false);
 

src/AST/Pass.impl.hpp

@@ -597 +597 @@
                         guard_symtab guard { *this };
                         // implicit add __func__ identifier as specified in the C manual 6.4.2.2
+                        // This is a C name and so has C linkage.
                         static ast::ptr< ast::ObjectDecl > func{ new ast::ObjectDecl{
                                 CodeLocation{}, "__func__",
@@ -602 +603 @@
                                         new ast::BasicType{ ast::BasicType::Char, ast::CV::Const },
                                         nullptr, VariableLen, DynamicDim
-                                }
+                                },
+                                nullptr,
+                                ast::Storage::Classes(),
+                                ast::Linkage::C,
                         } };
                         __pass::symtab::addId( core, 0, func );