From 67bd0267db00cf71b5f3301559a39bac32b65476 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Tue, 10 Sep 2019 21:05:41 +0200
Subject: Correct calculation of padding length in struct

Make sure the resulting type is in-sync with the one produced and used
by LLVM.

Fixes #3138
---
 src/analyze.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/analyze.cpp')

diff --git a/src/analyze.cpp b/src/analyze.cpp
index e0ba82f9b5..5d6a2d900c 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -7839,7 +7839,7 @@ static void resolve_llvm_types_struct(CodeGen *g, ZigType *struct_type, ResolveS
 
             assert(next_offset >= llvm_next_offset);
             if (next_offset > llvm_next_offset) {
-                size_t pad_bytes = next_offset - (field->offset + field_type->abi_size);
+                size_t pad_bytes = next_offset - llvm_next_offset;
                 if (pad_bytes != 0) {
                     LLVMTypeRef pad_llvm_type = LLVMArrayType(LLVMInt8Type(), pad_bytes);
                     element_types[gen_field_index] = pad_llvm_type;
-- 
cgit v1.2.3