All - Compilation fixes on VS2015 (constructors, warnings, missing files, class/struct disagreement, <algorithm>)

23 files changed, 138 insertions, 37 deletions

diff --git a/src/ast/crate.cpp b/src/ast/crate.cpp
index e788f6e0..19a19381 100644
--- a/src/ast/crate.cpp
+++ b/src/ast/crate.cpp
@@ -12,7 +12,12 @@
 #include <hir/hir.hpp>  // HIR::Crate
 #include <hir/main_bindings.hpp>    // HIR_Deserialise
 #include <fstream>
-#include <dirent.h>
+#ifdef _WIN32
+# define NOGDI  // prevent ERROR from being defined
+# include <Windows.h>
+#else
+# include <dirent.h>
+#endif
 
 ::std::vector<::std::string>    AST::g_crate_load_dirs = { };
 ::std::map<::std::string, ::std::string>    AST::g_crate_overrides;
@@ -167,6 +172,17 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st
             path = "";
 
             // Search for `p+"/lib"+name+"-*.rlib" (which would match e.g. libnum-0.11.rlib)
+#ifdef _WIN32
+            WIN32_FIND_DATA find_data;
+            auto mask = p + "\\*";
+            HANDLE find_handle = FindFirstFile( mask.c_str(), &find_data );
+            if( find_handle == INVALID_HANDLE_VALUE ) {
+                continue ;
+            }
+            do
+            {
+                const auto* fname = find_data.cFileName;
+#else
             auto dp = opendir(p.c_str());
             if( !dp ) {
                 continue ;
@@ -174,12 +190,15 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st
             struct dirent *ent;
             while( (ent = readdir(dp)) != nullptr && path == "" )
             {
+                const auto* fname = ent->d_name;
+#endif
+
                 // AND the start is "lib"+name
-                size_t len = strlen(ent->d_name);
-                if( len > (sizeof(RLIB_SUFFIX)-1) && strcmp(ent->d_name + len - (sizeof(RLIB_SUFFIX)-1), RLIB_SUFFIX) == 0 )
+                size_t len = strlen(fname);
+                if( len > (sizeof(RLIB_SUFFIX)-1) && strcmp(fname + len - (sizeof(RLIB_SUFFIX)-1), RLIB_SUFFIX) == 0 )
                 {
                 }
-                else if( len > (sizeof(RDYLIB_SUFFIX)-1) && strcmp(ent->d_name + len - (sizeof(RDYLIB_SUFFIX)-1), RDYLIB_SUFFIX) == 0 )
+                else if( len > (sizeof(RDYLIB_SUFFIX)-1) && strcmp(fname + len - (sizeof(RDYLIB_SUFFIX)-1), RDYLIB_SUFFIX) == 0 )
                 {
                 }
                 else
@@ -187,14 +206,19 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st
                     continue ;
                 }
 
-                DEBUG(ent->d_name << " vs " << name_prefix);
+                DEBUG(fname << " vs " << name_prefix);
                 // Check if the entry ends with .rlib
-                if( strncmp(name_prefix.c_str(), ent->d_name, name_prefix.size()) != 0 )
+                if( strncmp(name_prefix.c_str(), fname, name_prefix.size()) != 0 )
                     continue ;
 
-                paths.push_back( p + "/" + ent->d_name );
+                paths.push_back( p + "/" + fname );
+#ifdef _WIN32
+            } while( FindNextFile(find_handle, &find_data) );
+            FindClose(find_handle);
+#else
             }
             closedir(dp);
+#endif
             if( paths.size() > 0 )
                 break;
         }
diff --git a/src/hir/from_ast.cpp b/src/hir/from_ast.cpp
index 54644806..4cde40fc 100644
--- a/src/hir/from_ast.cpp
+++ b/src/hir/from_ast.cpp
@@ -31,10 +31,10 @@ const ::AST::Crate* g_ast_crate_ptr;
 // --------------------------------------------------------------------
 HIR::LifetimeRef LowerHIR_LifetimeRef(const ::AST::LifetimeRef& r)
 {
-    return HIR::LifetimeRef {
+    return HIR::LifetimeRef(
         // TODO: names?
         r.binding()
-        };
+        );
 }
 
 ::HIR::GenericParams LowerHIR_GenericParams(const ::AST::GenericParams& gp, bool* self_is_sized)
diff --git a/src/hir/hir.hpp b/src/hir/hir.hpp
index bdfc8d0b..8b718b4f 100644
--- a/src/hir/hir.hpp
+++ b/src/hir/hir.hpp
@@ -323,6 +323,22 @@ public:
         (Named, t_struct_fields)
         );
 
+    Struct(GenericParams params, Repr repr, Data data)
+        :m_params(mv$(params))
+        ,m_repr(mv$(repr))
+        ,m_data(mv$(data))
+    {
+    }
+    Struct(GenericParams params, Repr repr, Data data, unsigned align, TraitMarkings tm, StructMarkings sm)
+        :m_params(mv$(params))
+        ,m_repr(mv$(repr))
+        ,m_data(mv$(data))
+        ,m_forced_alignment(align)
+        ,m_markings(mv$(tm))
+        ,m_struct_markings(mv$(sm))
+    {
+    }
+
     GenericParams   m_params;
     Repr    m_repr;
     Data    m_data;
diff --git a/src/hir/type.hpp b/src/hir/type.hpp
index fe28deed..cbc2e94a 100644
--- a/src/hir/type.hpp
+++ b/src/hir/type.hpp
@@ -93,6 +93,15 @@ struct LifetimeRef
     // Values below 2^16 are parameters/static, values above are per-function region IDs allocated during region inferrence.
     uint32_t  binding = UNKNOWN;
 
+    LifetimeRef()
+        :binding(UNKNOWN)
+    {
+    }
+    LifetimeRef(uint32_t binding)
+        :binding(binding)
+    {
+    }
+
     static LifetimeRef new_static() {
         LifetimeRef rv;
         rv.binding = STATIC;
diff --git a/src/hir_expand/vtable.cpp b/src/hir_expand/vtable.cpp
index cd7b3413..d2afff5d 100644
--- a/src/hir_expand/vtable.cpp
+++ b/src/hir_expand/vtable.cpp
@@ -231,12 +231,11 @@ namespace {
                 }
             }
             // TODO: Would like to have access to the publicity marker
-            auto item_path = m_new_type(true, RcString::new_interned(FMT(p.get_name() << "#vtable")), ::HIR::Struct {
-                mv$(args),
-                ::HIR::Struct::Repr::Rust,
-                ::HIR::Struct::Data(mv$(fields)),
-                {}
-                });
+            auto item_path = m_new_type(
+                true,
+                RcString::new_interned(FMT(p.get_name() << "#vtable")),
+                ::HIR::Struct(mv$(args), ::HIR::Struct::Repr::Rust, ::HIR::Struct::Data(mv$(fields)))
+                );
             tr.m_vtable_path = item_path;
             DEBUG("Vtable structure created - " << item_path);
             ::HIR::GenericPath  path( mv$(item_path), mv$(params) );
diff --git a/src/hir_typeck/expr_visit.cpp b/src/hir_typeck/expr_visit.cpp
index c655bc52..df27b7d7 100644
--- a/src/hir_typeck/expr_visit.cpp
+++ b/src/hir_typeck/expr_visit.cpp
@@ -65,6 +65,12 @@ namespace typeck {
             TU_ARMA(Function, e) {
                 m_item_generics = &e.m_params;
                 }
+            TU_ARMA(Constant, e) {
+                m_item_generics = &e.m_params;
+                }
+            TU_ARMA(Static, e) {
+                m_item_generics = nullptr;
+                }
             }
         }
         else if( ip.parent->ty )
@@ -91,6 +97,7 @@ namespace typeck {
                 }
             TU_ARMA(StructConstant, _e) BUG(sp, ip << " is StructConstant");
             TU_ARMA(StructConstructor, _e) BUG(sp, ip << " is StructConstructor");
+            TU_ARMA(Import, _e) BUG(sp, ip << " is Import");
             }
         }
     }
diff --git a/src/include/span.hpp b/src/include/span.hpp
index 68d6bfdf..51c3440c 100644
--- a/src/include/span.hpp
+++ b/src/include/span.hpp
@@ -29,8 +29,9 @@ struct ProtoSpan
     unsigned int start_line;
     unsigned int start_ofs;
 };
-struct Span
+class Span
 {
+public:
     ::std::shared_ptr<Span> outer_span; // Expansion target for macros
     RcString    filename;
 
diff --git a/src/macro_rules/parse.cpp b/src/macro_rules/parse.cpp
index 97e1f8f9..43ffb097 100644
--- a/src/macro_rules/parse.cpp
+++ b/src/macro_rules/parse.cpp
@@ -58,7 +58,9 @@ public:
             switch( GET_TOK(tok, lex) )
             {
             // TODO: Allow any reserved word
-            case TOK_RWORD_PUB ... TOK_RWORD_UNSIZED:
+            default:
+                if( !(TOK_RWORD_PUB <= tok.type() && tok.type() <= TOK_RWORD_UNSIZED) )
+                    throw ParseError::Unexpected(lex, tok);
             case TOK_IDENT: {
                 auto name = tok.type() == TOK_IDENT ? tok.istr() : RcString::new_interned(FMT(tok));
                 GET_CHECK_TOK(tok, lex, TOK_COLON);
@@ -123,8 +125,6 @@ public:
                     throw ParseError::Unexpected(lex, tok);
                 }
                 break; }
-            default:
-                throw ParseError::Unexpected(lex, tok);
             }
             break;
         case TOK_EOF:
diff --git a/src/mir/from_hir.cpp b/src/mir/from_hir.cpp
index 4ab1bf00..697f8141 100644
--- a/src/mir/from_hir.cpp
+++ b/src/mir/from_hir.cpp
@@ -19,6 +19,7 @@
 #include <mir/visit_crate_mir.hpp>
 #include <hir/expr_state.hpp>
 #include <trans/target.hpp> // Target_GetSizeAndAlignOf - for `box`
+#include <cctype>   // isdigit
 
 namespace {
 
diff --git a/src/mir/mir.cpp b/src/mir/mir.cpp
index 8e3045d6..a0def040 100644
--- a/src/mir/mir.cpp
+++ b/src/mir/mir.cpp
@@ -6,6 +6,7 @@
  * - MIR (Middle Intermediate Representation) definitions
  */
 #include <mir/mir.hpp>
+#include <algorithm>    // std::min
 
 namespace MIR {
     ::std::ostream& operator<<(::std::ostream& os, const Constant& v) {
diff --git a/src/mir/mir.hpp b/src/mir/mir.hpp
index f3d61dfa..99698134 100644
--- a/src/mir/mir.hpp
+++ b/src/mir/mir.hpp
@@ -655,7 +655,7 @@ public:
     ~EnumCachePtr();
     EnumCachePtr(EnumCachePtr&& x): p(x.p) { x.p = nullptr; }
     EnumCachePtr& operator=(EnumCachePtr&& x) { this->~EnumCachePtr(); p = x.p; x.p = nullptr; return *this; }
-    operator bool() { return p; }
+    operator bool() { return p != nullptr; }
     const EnumCache& operator*() const { return *p; }
     const EnumCache* operator->() const { return p; }
 };
diff --git a/src/rc_string.cpp b/src/rc_string.cpp
index 38f6b15d..260ba90a 100644
--- a/src/rc_string.cpp
+++ b/src/rc_string.cpp
@@ -9,6 +9,7 @@
 #include <cstring>
 #include <string>
 #include <iostream>
+#include <algorithm>    // std::max
 
 RcString::RcString(const char* s, unsigned int len):
     m_ptr(nullptr)
diff --git a/tools/standalone_miri/hir_sim.cpp b/tools/standalone_miri/hir_sim.cpp
index 135ea214..9d497054 100644
--- a/tools/standalone_miri/hir_sim.cpp
+++ b/tools/standalone_miri/hir_sim.cpp
@@ -156,6 +156,8 @@ size_t HIR::TypeRef::get_align(size_t ofs) const
         case RawType::USize:
         case RawType::ISize:
             return POINTER_SIZE;
+        case RawType::Unreachable:
+            LOG_BUG("Getting alignment of unreachable type");
         }
         throw "";
     }
diff --git a/tools/standalone_miri/mir.cpp b/tools/standalone_miri/mir.cpp
index 4a5df067..bc456ca6 100644
--- a/tools/standalone_miri/mir.cpp
+++ b/tools/standalone_miri/mir.cpp
@@ -9,6 +9,7 @@
 #include "../../src/mir/mir.hpp"
 #include "hir_sim.hpp"
 #include <iostream>
+#include <algorithm>    // std::min
 
 #if 0
 namespace std {
diff --git a/tools/standalone_miri/miri.cpp b/tools/standalone_miri/miri.cpp
index 21c39a1e..4eadac66 100644
--- a/tools/standalone_miri/miri.cpp
+++ b/tools/standalone_miri/miri.cpp
@@ -5,6 +5,7 @@
  * miri.cpp
  * - Interpreter core
  */
+#define _CRT_SECURE_NO_WARNINGS
 #include <iostream>
 #include "module_tree.hpp"
 #include "value.hpp"
@@ -15,13 +16,14 @@
 #include "miri.hpp"
 // VVV FFI
 #include <cstring>  // memrchr
+#include <sys/stat.h>
+#include <fcntl.h>
 #ifdef _WIN32
 # define NOMINMAX
 # include <Windows.h>
+#else
+# include <unistd.h>
 #endif
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 #undef DEBUG
 
 unsigned ThreadState::s_next_tls_key = 1;
@@ -2082,7 +2084,6 @@ bool InterpreterThread::call_extern(Value& rv, const ::std::string& link_name, c
     }
     else if( link_name == "GetModuleHandleW" )
     {
-        LOG_ASSERT(args.at(0).allocation, "");
         const auto& tgt_alloc = args.at(0).get_relocation(0);
         const void* arg0 = (tgt_alloc ? tgt_alloc.alloc().data_ptr() : nullptr);
         //extern void* GetModuleHandleW(const void* s);
@@ -2096,7 +2097,7 @@ bool InterpreterThread::call_extern(Value& rv, const ::std::string& link_name, c
         auto ret = GetModuleHandleW(static_cast<LPCWSTR>(arg0));
         if(ret)
         {
-            rv = Value::new_ffiptr(FFIPointer { "GetModuleHandleW", ret, 0 });
+            rv = Value::new_ffiptr(FFIPointer::new_void("GetModuleHandleW", ret));
         }
         else
         {
@@ -2121,7 +2122,7 @@ bool InterpreterThread::call_extern(Value& rv, const ::std::string& link_name, c
 
         if( ret )
         {
-            rv = Value::new_ffiptr(FFIPointer { "GetProcAddress", ret, 0 });
+            rv = Value::new_ffiptr(FFIPointer::new_void("GetProcAddress", ret));
         }
         else
         {
diff --git a/tools/standalone_miri/value.hpp b/tools/standalone_miri/value.hpp
index a76e922b..03a21970 100644
--- a/tools/standalone_miri/value.hpp
+++ b/tools/standalone_miri/value.hpp
@@ -57,6 +57,9 @@ struct FFIPointer
     const char* tag_name;
     ::std::shared_ptr<FfiLayout>    layout;
 
+    static FFIPointer new_void(const char* name, const void* v) {
+        return FFIPointer { const_cast<void*>(v), name, ::std::make_shared<FfiLayout>() };
+    }
     static FFIPointer new_const_bytes(const char* name, const void* s, size_t size) {
         return FFIPointer { const_cast<void*>(s), name, ::std::make_shared<FfiLayout>(FfiLayout::new_const_bytes(size)) };
     };
@@ -511,7 +514,7 @@ struct ValueRef:
                     LOG_NOTICE("ValueRef exceeds bounds of FFI buffer - " << ofs << "+" << size << " > " << m_alloc.ffi().get_size());
                 }
                 break;
-            default:
+            case RelocationPtr::Ty::Function:
                 LOG_TODO("");
             }
         }
diff --git a/tools/testrunner/main.cpp b/tools/testrunner/main.cpp
index 148fff9d..a634d87a 100644
--- a/tools/testrunner/main.cpp
+++ b/tools/testrunner/main.cpp
@@ -170,12 +170,15 @@ int main(int argc, const char* argv[])
         return v;
     }
 
+#ifdef _WIN32
+#else
     {
         struct sigaction    sa = {0};
         sa.sa_handler = sigalrm_handler;
         sigaction(SIGALRM, &sa, NULL);
         signal(SIGINT, sigint_handler);
     }
+#endif
 
     ::std::vector<::std::string>    skip_list;
     //  > Filter out tests listed in an exceptions file (newline separated, supports comments)
diff --git a/vsproject/minicargo/minicargo.vcxproj b/vsproject/minicargo/minicargo.vcxproj
index 25ffbe03..c632cee2 100644
--- a/vsproject/minicargo/minicargo.vcxproj
+++ b/vsproject/minicargo/minicargo.vcxproj
@@ -75,6 +75,8 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\tools\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
@@ -87,6 +89,8 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\tools\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
@@ -101,6 +105,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\tools\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -117,6 +123,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\tools\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -127,6 +135,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\tools\minicargo\build.cpp" />
+    <ClCompile Include="..\..\tools\minicargo\cfg.cpp" />
     <ClCompile Include="..\..\tools\minicargo\main.cpp" />
     <ClCompile Include="..\..\tools\minicargo\manifest.cpp" />
     <ClCompile Include="..\..\tools\minicargo\repository.cpp" />
diff --git a/vsproject/minicargo/minicargo.vcxproj.filters b/vsproject/minicargo/minicargo.vcxproj.filters
index 8fcee797..b9066a85 100644
--- a/vsproject/minicargo/minicargo.vcxproj.filters
+++ b/vsproject/minicargo/minicargo.vcxproj.filters
@@ -27,6 +27,9 @@
     <ClCompile Include="..\..\tools\minicargo\repository.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\tools\minicargo\cfg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\tools\minicargo\manifest.h">
diff --git a/vsproject/mrustc.vcxproj b/vsproject/mrustc.vcxproj
index 13c4a23e..6cd135f4 100644
--- a/vsproject/mrustc.vcxproj
+++ b/vsproject/mrustc.vcxproj
@@ -157,6 +157,8 @@
     <ProjectReference />
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\auto_impls.cpp" />
+    <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\mangling_v2.cpp" />
     <ClCompile Include="..\src\ast\ast.cpp" />
     <ClCompile Include="..\src\ast\crate.cpp" />
     <ClCompile Include="..\src\ast\dump.cpp" />
@@ -166,6 +168,7 @@
     <ClCompile Include="..\src\ast\types.cpp" />
     <ClCompile Include="..\src\debug.cpp" />
     <ClCompile Include="..\src\expand\asm.cpp" />
+    <ClCompile Include="..\src\expand\assert.cpp" />
     <ClCompile Include="..\src\expand\cfg.cpp" />
     <ClCompile Include="..\src\expand\concat.cpp" />
     <ClCompile Include="..\src\expand\crate_tags.cpp" />
@@ -193,6 +196,7 @@
     <ClCompile Include="..\src\hir\from_ast_expr.cpp" />
     <ClCompile Include="..\src\hir\generic_params.cpp" />
     <ClCompile Include="..\src\hir\hir.cpp" />
+    <ClCompile Include="..\src\hir\hir_ops.cpp" />
     <ClCompile Include="..\src\hir\path.cpp" />
     <ClCompile Include="..\src\hir\pattern.cpp" />
     <ClCompile Include="..\src\hir\serialise.cpp" />
@@ -204,9 +208,9 @@
     <ClCompile Include="..\src\hir_conv\expand_type.cpp" />
     <ClCompile Include="..\src\hir_conv\markings.cpp" />
     <ClCompile Include="..\src\hir_conv\resolve_ufcs.cpp" />
+    <ClCompile Include="..\src\hir_conv\resolve_ufcs_outer.cpp" />
     <ClCompile Include="..\src\hir_expand\annotate_value_usage.cpp" />
     <ClCompile Include="..\src\hir_expand\closures.cpp" />
-    <ClCompile Include="..\src\hir_expand\const_eval_full.cpp" />
     <ClCompile Include="..\src\hir_expand\erased_types.cpp" />
     <ClCompile Include="..\src\hir_expand\reborrow.cpp" />
     <ClCompile Include="..\src\hir_expand\ufcs_everything.cpp" />
@@ -259,7 +263,6 @@
     <ClCompile Include="..\src\trans\codegen_c_structured.cpp" />
     <ClCompile Include="..\src\trans\codegen_mmir.cpp" />
     <ClCompile Include="..\src\trans\enumerate.cpp" />
-    <ClCompile Include="..\src\trans\mangling.cpp" />
     <ClCompile Include="..\src\trans\monomorphise.cpp" />
     <ClCompile Include="..\src\trans\target.cpp" />
     <ClCompile Include="..\src\trans\trans_list.cpp" />
diff --git a/vsproject/mrustc.vcxproj.filters b/vsproject/mrustc.vcxproj.filters
index 755013af..9d9dbcb4 100644
--- a/vsproject/mrustc.vcxproj.filters
+++ b/vsproject/mrustc.vcxproj.filters
@@ -98,9 +98,6 @@
     <ClCompile Include="..\src\hir_expand\closures.cpp">
       <Filter>Source Files\hir_expand</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\hir_expand\const_eval_full.cpp">
-      <Filter>Source Files\hir_expand</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\hir_conv\bind.cpp">
       <Filter>Source Files\hir_conv</Filter>
     </ClCompile>
@@ -212,9 +209,6 @@
     <ClCompile Include="..\src\trans\monomorphise.cpp">
       <Filter>Source Files\trans</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\trans\mangling.cpp">
-      <Filter>Source Files\trans</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\expand\lang_item.cpp">
       <Filter>Source Files\expand</Filter>
     </ClCompile>
@@ -392,6 +386,21 @@
     <ClCompile Include="..\src\version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\auto_impls.cpp">
+      <Filter>Source Files\trans</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mrustc-merge_attempt_one\src\trans\mangling_v2.cpp">
+      <Filter>Source Files\trans</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hir_conv\resolve_ufcs_outer.cpp">
+      <Filter>Source Files\hir_conv</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hir\hir_ops.cpp">
+      <Filter>Source Files\hir</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\expand\assert.cpp">
+      <Filter>Source Files\expand</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\common.hpp">
diff --git a/vsproject/standalone_miri/standalone_miri.vcxproj b/vsproject/standalone_miri/standalone_miri.vcxproj
index 5c235353..6b3c317c 100644
--- a/vsproject/standalone_miri/standalone_miri.vcxproj
+++ b/vsproject/standalone_miri/standalone_miri.vcxproj
@@ -90,7 +90,8 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\src\include;$(SolutionDir)..\tools\standalone_miri;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatSpecificWarningsAsErrors>4062;4061;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <DisableSpecificWarnings>4061</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -106,7 +107,8 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\src\include;$(SolutionDir)..\tools\standalone_miri;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatSpecificWarningsAsErrors>4062;4061;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <DisableSpecificWarnings>4061</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -125,6 +127,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\src\include;$(SolutionDir)..\tools\standalone_miri;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <DisableSpecificWarnings>4061</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -145,6 +148,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\src\include;$(SolutionDir)..\tools\standalone_miri;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+      <DisableSpecificWarnings>4061</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -165,6 +169,7 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\rc_string.cpp" />
     <ClCompile Include="..\..\tools\standalone_miri\debug.cpp" />
     <ClCompile Include="..\..\tools\standalone_miri\hir_sim.cpp" />
     <ClCompile Include="..\..\tools\standalone_miri\lex.cpp" />
diff --git a/vsproject/standalone_miri/standalone_miri.vcxproj.filters b/vsproject/standalone_miri/standalone_miri.vcxproj.filters
index 3b25bbfb..5e7af341 100644
--- a/vsproject/standalone_miri/standalone_miri.vcxproj.filters
+++ b/vsproject/standalone_miri/standalone_miri.vcxproj.filters
@@ -62,5 +62,8 @@
     <ClCompile Include="..\..\tools\standalone_miri\miri.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\rc_string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file