Changeset fb57626 for src/CodeGen

Timestamp:

Dec 18, 2017, 2:27:58 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

46dfe66

Parents:

b8b075cd (diff), 06088f9a (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:/u/cforall/software/cfa/cfa-cc

File:

• src/CodeGen/FixMain.cc (modified) (3 diffs)

src/CodeGen/FixMain.cc

@@ -23 +23 @@
 
 #include "Common/SemanticError.h"  // for SemanticError
+#include "CodeGen/GenType.h"       // for GenType
 #include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
 #include "SynTree/Type.h"          // for FunctionType
@@ -29 +30 @@
         bool FixMain::replace_main = false;
         std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
+
+        template<typename container>
+        std::string genTypeAt(const container& p, size_t idx) {
+                return genType((*std::next(p.begin(), idx))->get_type(), "");
+        }
 
         void FixMain::registerMain(FunctionDecl* functionDecl)
@@ -43 +49 @@
 
                         os << main_signature->get_scopedMangleName() << "(";
-                        switch(main_signature->get_functionType()->get_parameters().size()) {
-                                case 3: os << "argc, argv, envp"; break;
-                                case 2: os << "argc, argv"; break;
+                        const auto& params = main_signature->get_functionType()->get_parameters();
+                        switch(params.size()) {
+                                case 3: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv, (" << genTypeAt(params, 2) << ")envp"; break;
+                                case 2: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv"; break;
                                 case 0: break;
                                 default : assert(false);