summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/nim.cfg2
-rw-r--r--compiler/rodimpl.nim7
2 files changed, 8 insertions, 1 deletions
diff --git a/compiler/nim.cfg b/compiler/nim.cfg
index db6e4f74f..ba90a8284 100644
--- a/compiler/nim.cfg
+++ b/compiler/nim.cfg
@@ -7,7 +7,7 @@ define:nimcore
 #define:nimIncremental
 #import:"$projectpath/testability"
 
-define:staticSqlite
+#define:staticSqlite
 
 @if windows:
   cincludes: "$lib/wrappers/libffi/common"
diff --git a/compiler/rodimpl.nim b/compiler/rodimpl.nim
index b58f77ff6..2c84111d8 100644
--- a/compiler/rodimpl.nim
+++ b/compiler/rodimpl.nim
@@ -223,6 +223,9 @@ proc encodeType(g: ModuleGraph, t: PType, result: var string) =
   if t.lockLevel.ord != UnspecifiedLockLevel.ord:
     add(result, '\14')
     encodeVInt(t.lockLevel.int16, result)
+  if t.paddingAtEnd != 0:
+    add(result, '\15')
+    encodeVInt(t.paddingAtEnd, result)
   for a in t.attachedOps:
     add(result, '\16')
     if a == nil:
@@ -631,6 +634,10 @@ proc loadType(g; id: int; info: TLineInfo): PType =
   else:
     result.lockLevel = UnspecifiedLockLevel
 
+  if b.s[b.pos] == '\15':
+    inc(b.pos)
+    result.paddingAtEnd = decodeVInt(b.s, b.pos).int16
+
   for a in low(result.attachedOps)..high(result.attachedOps):
     if b.s[b.pos] == '\16':
       inc(b.pos)