diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 6 | ||||
| -rw-r--r-- | test/Sema/offsetof.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 83002d5695..ddcbb6d6b1 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -8383,10 +8383,14 @@ ExprResult Sema::BuildBuiltinOffsetOf(SourceLocation BuiltinLoc, return ExprError(Diag(Idx->getLocStart(), diag::err_typecheck_subscript_not_integer) << Idx->getSourceRange()); + + ExprResult IdxRvalue = DefaultLvalueConversion(Idx); + if (IdxRvalue.isInvalid()) + return ExprError(); // Record this array index. Comps.push_back(OffsetOfNode(OC.LocStart, Exprs.size(), OC.LocEnd)); - Exprs.push_back(Idx); + Exprs.push_back(IdxRvalue.take()); continue; } diff --git a/test/Sema/offsetof.c b/test/Sema/offsetof.c index 5026193943..46fb515c7f 100644 --- a/test/Sema/offsetof.c +++ b/test/Sema/offsetof.c @@ -65,3 +65,7 @@ int test3 = __builtin_offsetof(struct has_bitfields, j); // expected-error{{cann typedef struct Array { int array[1]; } Array; int test4 = __builtin_offsetof(Array, array); + +int test5() { + return __builtin_offsetof(Array, array[*(int*)0]); // expected-warning{{indirection of non-volatile null pointer}} expected-note{{__builtin_trap}} +} |