PR3269: create an empty InitListExpr as a child for the

CompoundLiteralExpr so that there aren't any null pointers in the AST.

llvm-svn: 62981

1 files changed, 7 insertions, 3 deletions

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 1d55ed7c3aa..9b91ec6ee5f 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -3987,9 +3987,13 @@ Sema::ExprResult Sema::ActOnBuiltinOffsetOf(Scope *S,
   
   // Otherwise, create a compound literal expression as the base, and
   // iteratively process the offsetof designators.
-  Expr *Res = new (Context) CompoundLiteralExpr(SourceLocation(), ArgTy, 0, 
-                                                false);
-  
+  InitListExpr *IList =
+      new (Context) InitListExpr(SourceLocation(), 0, 0,
+                                 SourceLocation(), false);
+  IList->setType(ArgTy);
+  Expr *Res =
+      new (Context) CompoundLiteralExpr(SourceLocation(), ArgTy, IList, false);
+
   // offsetof with non-identifier designators (e.g. "offsetof(x, a.b[c])") are a
   // GCC extension, diagnose them.
   if (NumComponents != 1)