Changeset 800bae1 for src/AST

Timestamp:

Jun 17, 2019, 3:37:00 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

54b3fde, 6e55240

Parents:

89faa82 (diff), aba20d2 (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

File:

• src/AST/Convert.cpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -576 +576 @@
                 if ( srcInferred.mode == ast::Expr::InferUnion::Params ) {
                         const ast::InferredParams &srcParams = srcInferred.inferParams();
-                        for (auto srcParam : srcParams) {
-                                tgtInferParams[srcParam.first] = ParamEntry(
+                        for (auto & srcParam : srcParams) {
+                                auto res = tgtInferParams.emplace(srcParam.first, ParamEntry(
                                         srcParam.second.decl,
                                         get<Declaration>().accept1(srcParam.second.declptr),
@@ -583 +583 @@
                                         get<Type>().accept1(srcParam.second.formalType),
                                         get<Expression>().accept1(srcParam.second.expr)
-                                );
+                                ));
+                                assert(res.second);
                         }
                 } else if ( srcInferred.mode == ast::Expr::InferUnion::Slots  ) {
@@ -1982 +1983 @@
                 if ( !oldInferParams.empty() ) {
                         ast::InferredParams &tgt = newInferred.inferParams();
-                        for (auto old : oldInferParams) {
+                        for (auto & old : oldInferParams) {
                                 tgt[old.first] = ast::ParamEntry(
                                         old.second.decl,