diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-12-26 10:20:01 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-12-26 10:20:01 +0800 |
| commit | 9e3ab4278fea40b9282c3c6e166020763fd7028d (patch) | |
| tree | 973c70d3e5550d482ea5a56e6942664e1fe16bbd /src | |
| parent | 40d9ac73f5a7312cdd3c7c20a671561d230a02d7 (diff) | |
| download | mrust-9e3ab4278fea40b9282c3c6e166020763fd7028d.tar.gz | |
MIR Optimise - Fix sligt bugs
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir/optimise.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/mir/optimise.cpp b/src/mir/optimise.cpp index 11cbe45e..a07e1a38 100644 --- a/src/mir/optimise.cpp +++ b/src/mir/optimise.cpp @@ -1337,7 +1337,7 @@ bool MIR_Optimise_DeTemporary(::MIR::TypeResolve& state, ::MIR::Function& fcn) DEBUG(state << "> Replace (and keep) Local(" << it->first << ") with " << ilv); } // - Top-level (directly used) also good. - else if( top_level ) + else if( top_level && top_usage == ValUsage::Move ) { // TODO: DstMeta/DstPtr _doesn't_ move, so shouldn't trigger this. ilv = bb.statements[it->second].as_Assign().src.as_Use().clone(); @@ -1382,8 +1382,17 @@ bool MIR_Optimise_DeTemporary(::MIR::TypeResolve& state, ::MIR::Function& fcn) // - Check if this is a new assignment if( stmt.is_Assign() && stmt.as_Assign().dst.is_Local() && stmt.as_Assign().src.is_Use() ) { - local_assignments.insert(::std::make_pair( stmt.as_Assign().dst.as_Local(), stmt_idx )); - DEBUG(state << "> Record assignment"); + if( visit_mir_lvalue(stmt.as_Assign().src.as_Use(), ValUsage::Read, [&](const auto& lv, auto /*vu*/) { + return lv == stmt.as_Assign().dst; + }) ) + { + DEBUG(state << "> Don't record, self-referrential"); + } + else + { + local_assignments.insert(::std::make_pair( stmt.as_Assign().dst.as_Local(), stmt_idx )); + DEBUG(state << "> Record assignment"); + } } } // for(stmt in bb.statements) |