Merge branch 'master' of https://github.com/thepowersgang/mrustc

1 files changed, 4 insertions, 6 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0e37f4a3..2dd05a05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -513,7 +513,10 @@ int main(int argc, char *argv[])
             HIR_Expand_Closures(*hir_crate);
             });
         // - Construct VTables for all traits and impls.
-        CompilePhaseV("Expand HIR VTables", [&]() { HIR_Expand_VTables(*hir_crate); });
+        //  TODO: How early can this be done?
+        CompilePhaseV("Expand HIR VTables", [&]() {
+            HIR_Expand_VTables(*hir_crate);
+            });
         // - And calls can be turned into UFCS
         CompilePhaseV("Expand HIR Calls", [&]() {
             HIR_Expand_UfcsEverything(*hir_crate);
@@ -560,11 +563,6 @@ int main(int argc, char *argv[])
             MIR_CheckCrate(*hir_crate);
             });
 
-        // Second shot of constant evaluation (with full type information)
-        CompilePhaseV("Constant Evaluate Full", [&]() {
-            ConvertHIR_ConstantEvaluateFull(*hir_crate);
-            });
-
         if( params.debug.dump_hir )
         {
             // DUMP after consteval (full HIR again)