Merge pull request #5159 from ibuclaw/overlapping

Refactor detection of overlapping fields in StructInitializer semantic
dlang · Oct 7, 2015 · 344630e · 344630e
2 parents 94d9694 + 221b3e8
commit 344630e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/init.d b/src/init.d
@@ -311,8 +311,7 @@ public:
                 for (size_t j = 0; j < nfields; j++)
                 {
                     VarDeclaration v2 = sd.fields[j];
-                    bool overlap = (vd.offset < v2.offset + v2.type.size() && v2.offset < vd.offset + vd.type.size());
-                    if (overlap && (*elements)[j])
+                    if (vd.isOverlappedWith(v2) && (*elements)[j])
                     {
                         error(loc, "overlapping initialization for field %s and %s", v2.toChars(), vd.toChars());
                         errors = true;