diff options
| -rw-r--r-- | lib/Analysis/GRExprEngine.cpp | 28 | ||||
| -rw-r--r-- | test/Analysis/misc-ps.m | 25 |
2 files changed, 40 insertions, 13 deletions
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp index d6b15b1e2c..769e4b31a6 100644 --- a/lib/Analysis/GRExprEngine.cpp +++ b/lib/Analysis/GRExprEngine.cpp @@ -1973,22 +1973,24 @@ void GRExprEngine::VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr* Ex, uint64_t amt; if (Ex->isSizeOf()) { - - // FIXME: Add support for VLAs. - if (!T.getTypePtr()->isConstantSizeType()) + if (T == getContext().VoidTy) { + // sizeof(void) == 1 byte. + amt = 1; + } + else if (!T.getTypePtr()->isConstantSizeType()) { + // FIXME: Add support for VLAs. return; - - // Some code tries to take the sizeof an ObjCInterfaceType, relying that - // the compiler has laid out its representation. Just report Unknown - // for these. - if (T->isObjCInterfaceType()) + } + else if (T->isObjCInterfaceType()) { + // Some code tries to take the sizeof an ObjCInterfaceType, relying that + // the compiler has laid out its representation. Just report Unknown + // for these. return; - - amt = 1; // Handle sizeof(void) - - if (T != getContext().VoidTy) + } + else { + // All other cases. amt = getContext().getTypeSize(T) / 8; - + } } else // Get alignment of the type. amt = getContext().getTypeAlign(T) / 8; diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m index be697f8f3a..5fccf5724e 100644 --- a/test/Analysis/misc-ps.m +++ b/test/Analysis/misc-ps.m @@ -87,3 +87,28 @@ void check_uninit_sized_VLA() { int vla[x]; // expected-warning{{The expression used to specify the number of elements in the VLA 'vla' evaluates to an undefined or garbage value.}} } +// sizeof(void) +// - Tests a regression reported in PR 3211: http://llvm.org/bugs/show_bug.cgi?id=3211 +void handle_sizeof_void(unsigned flag) { + int* p = 0; + + if (flag) { + if (sizeof(void) == 1) + return; + // Infeasible. + *p = 1; // no-warning + } + + void* q; + + if (!flag) { + if (sizeof(*q) == 1) + return; + // Infeasibe. + *p = 1; // no-warning + } + + // Infeasible. + *p = 1; // no-warning +} + |