Changeset 90152a4 for src/CodeGen/FixMain.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

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
@@ -30 +31 @@
         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)
         {
                 if(main_signature) {
-                        throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                        SemanticError(functionDecl, "Multiple definition of main routine\n");
                 }
                 main_signature.reset( functionDecl->clone() );
@@ -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);