diff --git a/lib/Checker/CheckerHelpers.cpp b/lib/Checker/CheckerHelpers.cpp
index 8a295fb..e3cb36b 100644
--- a/lib/Checker/CheckerHelpers.cpp
+++ b/lib/Checker/CheckerHelpers.cpp
@@ -65,13 +65,16 @@
   return false;
 }
 
-// Recursively find any substatements containing __builtin_offset_of
+// Recursively find any substatements containing __builtin_offsetof
 bool clang::containsBuiltinOffsetOf(const Stmt *S) {
   const UnaryOperator *UO = dyn_cast<UnaryOperator>(S);
 
   if (UO && UO->getOpcode() == UnaryOperator::OffsetOf)
     return true;
 
+  if (isa<OffsetOfExpr>(S))
+    return true;
+
   for (Stmt::const_child_iterator I = S->child_begin(); I != S->child_end();
       ++I)
     if (const Stmt *child = *I)