diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-17 05:48:07 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-17 05:48:07 +0000 |
| commit | eda61288adabacc168f66ee70469d9864186e5dc (patch) | |
| tree | 3d46db63f810ac5ef4448b8f9ccb6873033c4aa8 /clang/lib/Sema | |
| parent | e20793a4f10dec1f793c97fdce253695811d52ac (diff) | |
| download | bcm5719-llvm-eda61288adabacc168f66ee70469d9864186e5dc.tar.gz bcm5719-llvm-eda61288adabacc168f66ee70469d9864186e5dc.zip | |
Perform an lvalue-to-rvalue conversion on an array index in a __builtin_offsetof expression.
llvm-svn: 142179
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 83002d56956..ddcbb6d6b1b 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/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; } |
