summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2018-03-05 08:43:59 +0800
committerJohn Hodge <tpg@mutabah.net>2018-03-17 18:52:16 +0800
commit5118328a10bf3042f4301080cb72762ed4c0ca49 (patch)
tree2fbb78886e6cd3a4a7ad658262099812bd5ef608
parenta8cd5861fdee9040a82654cc9d1fd41f98759d8b (diff)
downloadmrust-5118328a10bf3042f4301080cb72762ed4c0ca49.tar.gz
MIR Optimise - Slight cleanup for faster compiles
-rw-r--r--src/mir/optimise.cpp17
-rw-r--r--src/trans/enumerate.cpp2
2 files changed, 11 insertions, 8 deletions
diff --git a/src/mir/optimise.cpp b/src/mir/optimise.cpp
index 0ddd8d3d..2cc81258 100644
--- a/src/mir/optimise.cpp
+++ b/src/mir/optimise.cpp
@@ -589,16 +589,19 @@ bool MIR_OptimiseInline(const StaticTraitResolve& resolve, const ::HIR::ItemPath
rv = true;
}
- MIR_Optimise_BlockSimplify(state, fcn);
- MIR_Optimise_UnifyBlocks(state, fcn);
+ if( rv )
+ {
+ MIR_Optimise_BlockSimplify(state, fcn);
+ MIR_Optimise_UnifyBlocks(state, fcn);
- MIR_Optimise_GarbageCollect(state, fcn);
- //MIR_Validate_Full(resolve, path, fcn, args, ret_type);
- MIR_SortBlocks(resolve, path, fcn);
+ MIR_Optimise_GarbageCollect(state, fcn);
+ //MIR_Validate_Full(resolve, path, fcn, args, ret_type);
+ MIR_SortBlocks(resolve, path, fcn);
#if CHECK_AFTER_DONE > 1
- MIR_Validate(resolve, path, fcn, args, ret_type);
+ MIR_Validate(resolve, path, fcn, args, ret_type);
#endif
+ }
return rv;
}
@@ -3731,7 +3734,7 @@ void MIR_OptimiseCrate_Inlining(const ::HIR::Crate& crate, TransList& list)
for(auto& fcn_ent : list.m_functions)
{
const auto& path = fcn_ent.first;
- const auto& pp = fcn_ent.second->pp;
+ //const auto& pp = fcn_ent.second->pp;
auto& hir_fcn = *const_cast<::HIR::Function*>(fcn_ent.second->ptr);
auto& mono_fcn = fcn_ent.second->monomorphised;
diff --git a/src/trans/enumerate.cpp b/src/trans/enumerate.cpp
index 4a6e5767..cecf87de 100644
--- a/src/trans/enumerate.cpp
+++ b/src/trans/enumerate.cpp
@@ -106,7 +106,7 @@ namespace {
Trans_Enumerate_ValItem(state, vi2, is_visible, [&](){ return e.path; });
}
}
- } break;
+ } break;
TU_ARM(vi, StructConstant, e) {
} break;
TU_ARM(vi, StructConstructor, e) {