Fix linux and setup versions

Erik McClure · Erik McClure · commit 625355b5994e · 2020-02-25T12:48:55.000-08:00
diff --git a/flatpak/org.freedesktop.Sdk.Extension.innative.yml b/flatpak/org.freedesktop.Sdk.Extension.innative.yml
@@ -13,7 +13,6 @@ modules:
                   - mv bin lib include llvm
                   - mkdir bin
                   - mv llvm bin
-                  - sed -i "s@c++1.@c++17@g" innative{,-cmd}/Makefile 
                   - sed -i "s@-lstdc++fs@@g" innative-{cmd,test}/Makefile
                   - make
                   - install -d /usr/lib/sdk/innative/include/innative
@@ -24,11 +23,11 @@ modules:
                   - cp bin/llvm/include/innative/*.h /usr/lib/sdk/innative/include/innative
                   - cp bin/{innative-cmd,innative-test} /usr/lib/sdk/innative/bin
                   - cp bin/{innative-env.a,innative-env-d.a,innative-test-embedding.a} /usr/lib/sdk/innative/lib
-                  - cp bin/libinnative.so /usr/lib/sdk/innative/lib/libinnative.so.0.1.4
+                  - cp bin/libinnative.so /usr/lib/sdk/innative/lib/libinnative.so.0.1.5
                   - cp -r innative-test /usr/lib/sdk/innative/innative-test
                   - cp -r scripts /usr/lib/sdk/innative/scripts
                   - cp -r innative /usr/lib/sdk/innative/innative
-                  - ln -s libinnative.so.0.1.4 /usr/lib/sdk/innative/lib/libinnative.so
+                  - ln -s libinnative.so.0.1.5 /usr/lib/sdk/innative/lib/libinnative.so
           sources:
                   - type: git
                     url: https://github.com/innative-sdk/innative
diff --git a/innative-cmd/main.cpp b/innative-cmd/main.cpp
@@ -653,7 +653,7 @@ int main(int argc, char* argv[])
   for(auto item : commandline.whitelist.values)
   {
     char* ctx;
-    char* first  = STRTOK(item.data(), ":", &ctx);
+    char* first  = STRTOK(const_cast<char*>(item.data()), ":", &ctx);
     char* second = STRTOK(NULL, ":", &ctx);
 
     if(!second)
diff --git a/innative-env/internal.c b/innative-env/internal.c
@@ -315,7 +315,7 @@ IN_COMPILER_DLLEXPORT extern void* _innative_internal_env_grow_memory(void* p, u
     if(max > 0) // If a maximum was specified, the memory should've been reserved already
     {
       // It's fine if we aren't aligned on page bounderies because the function won't fail on already committed pages.
-      if(!VirtualAlloc(info + *size, i, MEM_COMMIT, PAGE_READWRITE))
+      if(!VirtualAlloc(info + *size, (size_t)i, MEM_COMMIT, PAGE_READWRITE))
         return 0;
       i += *size;
     }
@@ -325,13 +325,13 @@ IN_COMPILER_DLLEXPORT extern void* _innative_internal_env_grow_memory(void* p, u
       SYSTEM_INFO sysinfo;
       GetSystemInfo(&sysinfo);
       size_t sz = *size % sysinfo.dwPageSize;
-      sz        = !sz ? *size : *size + sysinfo.dwPageSize - sz;
+      sz        = (size_t)(!sz ? *size : *size + sysinfo.dwPageSize - sz);
       i -= sz - *size; // Modify i by the difference
 
-      if(!VirtualAlloc(info + sz, i, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE))
+      if(!VirtualAlloc(info + sz, (size_t)i, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE))
       {
         // If this fails, we ran into someone else's memory, so we need to move the entire allocation.
-        void* mem = VirtualAlloc(0, i + sz, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+        void* mem = VirtualAlloc(0, (size_t)(i + sz), MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
         if(!mem)
           return 0;
         _innative_internal_env_memcpy(mem, info, *size);
@@ -355,10 +355,10 @@ IN_COMPILER_DLLEXPORT extern void* _innative_internal_env_grow_memory(void* p, u
     if(max > 0 && i > max)
       return 0;
 #ifdef IN_PLATFORM_WIN32
-    info = VirtualAlloc(0, !max ? i : max, MEM_RESERVE, PAGE_READWRITE);
+    info = VirtualAlloc(0, (size_t)(!max ? i : max), MEM_RESERVE, PAGE_READWRITE);
     if(!info)
       return 0;
-    if(!VirtualAlloc(info, i, MEM_COMMIT, PAGE_READWRITE))
+    if(!VirtualAlloc(info, (size_t)i, MEM_COMMIT, PAGE_READWRITE))
       return 0;
 
 #elif defined(IN_PLATFORM_POSIX)
diff --git a/innative-runtime-setup/Product.wxs b/innative-runtime-setup/Product.wxs
@@ -10,7 +10,7 @@
   <?error Unknown value for Platform variable ?>
   <?endif ?>
 
-  <?define Version="0.1.4" ?>
+  <?define Version="0.1.5" ?>
   <Product 
     Id="6A27F179-BADF-4580-821D-2892F229F335"
     Name="inNative Runtime v$(var.Version)" 
diff --git a/innative-sdk-setup/Product.wxs b/innative-sdk-setup/Product.wxs
@@ -10,7 +10,7 @@
   <?error Unknown value for Platform variable ?>
   <?endif ?>
 
-  <?define Version="0.1.4" ?>
+  <?define Version="0.1.5" ?>
   <Product 
     Id="25A4AE98-4F30-4735-B29B-37B6EDC5A9E9"
     Name="inNative SDK v$(var.Version)" 
diff --git a/innative/compile.h b/innative/compile.h
@@ -116,7 +116,7 @@ namespace innative {
             *out = str[i];
           break;
         }
-        n = (n > diff) ? n - diff : 0;
+        n = (static_cast<ptrdiff_t>(n) > diff) ? n - diff : 0;
         out += diff;
       }
       return out - start;
diff --git a/innative/debug_dwarf.cpp b/innative/debug_dwarf.cpp
@@ -112,7 +112,7 @@ void DebugDWARF::UpdateVariables(llvm::Function* fn, SourceMapScope& scope)
       expr = _dbuilder->createExpression(llvm::SmallVector<int64_t, 3>{ DW_OP_deref, DW_OP_stack_value });
 
       if(static_cast<unsigned long long>(v.p_expr[2]) < _context->locals.size())
-        _dbuilder->insertDbgValueIntrinsic(_context->locals[v.p_expr[2]], dparam, expr,
+        _dbuilder->insertDbgValueIntrinsic(_context->locals[static_cast<size_t>(v.p_expr[2])], dparam, expr,
                                            llvm::DILocation::get(_context->context, v.original_line, v.original_column,
                                                                  _curscope),
                                            _context->builder.GetInsertBlock());
@@ -122,7 +122,7 @@ void DebugDWARF::UpdateVariables(llvm::Function* fn, SourceMapScope& scope)
       expr = _dbuilder->createExpression(llvm::SmallVector<int64_t, 3>{ DW_OP_deref, DW_OP_stack_value });
 
       if(static_cast<unsigned long long>(v.p_expr[2]) < _context->globals.size())
-        _dbuilder->insertDbgValueIntrinsic(_context->globals[v.p_expr[2]], dparam, expr,
+        _dbuilder->insertDbgValueIntrinsic(_context->globals[static_cast<size_t>(v.p_expr[2])], dparam, expr,
                                            llvm::DILocation::get(_context->context, v.original_line, v.original_column,
                                                                  _curscope),
                                            _context->builder.GetInsertBlock());
diff --git a/innative/debug_pdb.cpp b/innative/debug_pdb.cpp
@@ -147,7 +147,7 @@ void DebugPDB::UpdateVariables(llvm::Function* fn, SourceMapScope& scope)
       expr = _dbuilder->createExpression(llvm::SmallVector<int64_t, 3>{ DW_OP_deref, DW_OP_stack_value });
 
       if(static_cast<unsigned long long>(v.p_expr[2]) < _context->locals.size())
-        _dbuilder->insertDbgValueIntrinsic(_context->locals[v.p_expr[2]], dparam, expr,
+        _dbuilder->insertDbgValueIntrinsic(_context->locals[static_cast<size_t>(v.p_expr[2])], dparam, expr,
                                            llvm::DILocation::get(_context->context, v.original_line, v.original_column,
                                                                  _curscope),
                                            _context->builder.GetInsertBlock());
@@ -157,7 +157,7 @@ void DebugPDB::UpdateVariables(llvm::Function* fn, SourceMapScope& scope)
       expr = _dbuilder->createExpression(llvm::SmallVector<int64_t, 3>{ DW_OP_deref, DW_OP_stack_value });
 
       if(static_cast<unsigned long long>(v.p_expr[2]) < _context->globals.size())
-        _dbuilder->insertDbgValueIntrinsic(_context->globals[v.p_expr[2]], dparam, expr,
+        _dbuilder->insertDbgValueIntrinsic(_context->globals[static_cast<size_t>(v.p_expr[2])], dparam, expr,
                                            llvm::DILocation::get(_context->context, v.original_line, v.original_column,
                                                                  _curscope),
                                            _context->builder.GetInsertBlock());
diff --git a/innative/dwarf_parser.cpp b/innative/dwarf_parser.cpp
@@ -594,7 +594,7 @@ bool DWARFParser::ParseDWARFChild(DWARFContext& DICtx, SourceMapScope* parent, c
       if(auto file = die.find(DW_AT_decl_file))
       {
         if(const auto* LT = CU->getContext().getLineTableForUnit(CU))
-          v.source_index = file->getAsUnsignedConstant().getValue() - 1;
+          v.source_index = static_cast<decltype(v.source_index)>(file->getAsUnsignedConstant().getValue() - 1);
       }
 
       if(auto addresses = die.getAddressRanges())
diff --git a/innative/parse.cpp b/innative/parse.cpp
@@ -496,7 +496,7 @@ IN_ERROR innative::ParseFunctionBody(Stream& s, FunctionBody& f, Module& m, cons
   IN_ERROR err  = ParseVarUInt32(s, f.body_size);
   size_t end    = s.pos + f.body_size; // body_size is the size of both local_entries and body in bytes.
   ptrdiff_t idx = &f - m.code.funcbody;
-  if(idx >= m.function.n_funcdecl)
+  if(idx >= static_cast<ptrdiff_t>(m.function.n_funcdecl))
     return ERR_FUNCTION_BODY_MISMATCH;
 
   auto& sig = m.type.functypes[m.function.funcdecl[idx].type_index];
diff --git a/innative/serialize.cpp b/innative/serialize.cpp
@@ -547,7 +547,7 @@ void innative::wat::WriteTokens(Queue<WatToken> tokens, std::ostream& out, bool
           out.put(' ');
       }
       if(tokens[i].u < OPNAMES.size())
-        out << OPNAMES[tokens[i].u];
+        out << OPNAMES[static_cast<size_t>(tokens[i].u)];
       else
         out << "[UNKNOWN OPERATOR: " << tokens[i].u << "]";
       break;
diff --git a/innative/sourcemap.cpp b/innative/sourcemap.cpp
@@ -343,7 +343,7 @@ IN_ERROR sourcemap::ParseRoot(const Environment& env, SourceMap* map, const char
   else if(!STRNICMP(keybegin, "mappings", keyend - keybegin))
     return ParseMapping(env, map, data, end);
   else if(!STRNICMP(keybegin, "x_google_linecount", keyend - keybegin))
-    map->x_google_linecount = ParseNumber(data, end);
+    map->x_google_linecount = static_cast<decltype(map->x_google_linecount)>(ParseNumber(data, end));
   else
     return ERR_MAP_UNKNOWN_KEY;
 
diff --git a/innative/wat.cpp b/innative/wat.cpp
@@ -1555,7 +1555,7 @@ int WatParser::ParseModule(Environment& env, Module& m, const char* file, Queue<
     case -static_cast<int>(WatTokens::ELEM):
     {
       size_t cache = tokens.GetPosition();
-      tokens.SetPosition(state.deferred[0].func);
+      tokens.SetPosition(static_cast<size_t>(state.deferred[0].func));
 
       TableInit init = { 0 };
       init.index     = static_cast<decltype(init.index)>(state.deferred[0].index);

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ int main(int argc, char* argv[])`
`653`	`653`	`for(auto item : commandline.whitelist.values)`
`654`	`654`	`{`
`655`	`655`	`char* ctx;`
`656`		`- char* first = STRTOK(item.data(), ":", &ctx);`
	`656`	`+ char* first = STRTOK(const_cast<char*>(item.data()), ":", &ctx);`
`657`	`657`	`char* second = STRTOK(NULL, ":", &ctx);`
`658`	`658`
`659`	`659`	`if(!second)`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace innative {`
`116`	`116`	`*out = str[i];`
`117`	`117`	`break;`
`118`	`118`	`}`
`119`		`- n = (n > diff) ? n - diff : 0;`
	`119`	`+ n = (static_cast<ptrdiff_t>(n) > diff) ? n - diff : 0;`
`120`	`120`	`out += diff;`
`121`	`121`	`}`
`122`	`122`	`return out - start;`
Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ bool DWARFParser::ParseDWARFChild(DWARFContext& DICtx, SourceMapScope* parent, c`
`594`	`594`	`if(auto file = die.find(DW_AT_decl_file))`
`595`	`595`	`{`
`596`	`596`	`if(const auto* LT = CU->getContext().getLineTableForUnit(CU))`
`597`		`- v.source_index = file->getAsUnsignedConstant().getValue() - 1;`
	`597`	`+ v.source_index = static_cast<decltype(v.source_index)>(file->getAsUnsignedConstant().getValue() - 1);`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`if(auto addresses = die.getAddressRanges())`