Changeset 90152a4 for src/CodeGen/FixNames.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/FixNames.cc (modified) (3 diffs)

src/CodeGen/FixNames.cc

@@ -56 +56 @@
                 auto && name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }
         std::string mangle_main_args() {
@@ -79 +79 @@
                 auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
-                return name;
+                return std::move(name);
         }
 
@@ -118 +118 @@
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
-                                throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                                SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
                         }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );