mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-05-03 07:36:07 +00:00
Code Issues Projects Releases Wiki Activity

Remember whether an initlist had a designator in the AST.

Browse Source 
llvm-svn: 58218
This commit is contained in:
Chris Lattner 2008-10-26 23:43:26 +00:00
parent 248388e313
commit 07d754acf1
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/Driver/RewriteObjC.cpp
View File

@ -2123,8 +2123,9 @@ Stmt *RewriteObjC::SynthMessageExpr(ObjCMessageExpr *Exp) {
// (struct objc_super) { <exprs from above> }
InitListExpr *ILE = new InitListExpr(SourceLocation(),
&InitExprs[0], InitExprs.size(),
SourceLocation());
SuperRep = new CompoundLiteralExpr(SourceLocation(), superType, ILE, false);
SourceLocation(), false);
SuperRep = new CompoundLiteralExpr(SourceLocation(), superType, ILE,
false);
}
// struct objc_super *
Expr *Unop = new UnaryOperator(SuperRep, UnaryOperator::AddrOf,
@ -2189,7 +2190,7 @@ Stmt *RewriteObjC::SynthMessageExpr(ObjCMessageExpr *Exp) {
// (struct objc_super) { <exprs from above> }
InitListExpr *ILE = new InitListExpr(SourceLocation(),
&InitExprs[0], InitExprs.size(),
SourceLocation());
SourceLocation(), false);
SuperRep = new CompoundLiteralExpr(SourceLocation(), superType, ILE, false);
}
// struct objc_super *

2
clang/clang.xcodeproj/project.pbxproj
View File

@ -900,7 +900,6 @@
DEAEECAE0A5AF0FA0045101B /* Driver */ = {
isa = PBXGroup;
children = (
35A057E60EAE2DDD0069249F /* CacheTokens.cpp */,
DE5932CD0AD60FF400BC794C /* clang.cpp */,
DE5932CE0AD60FF400BC794C /* clang.h */,
359DBBE20E1ACD4700F43FA0 /* AnalysisConsumer.h */,
@ -908,6 +907,7 @@
352028460E2C16820096ADE0 /* Analyses.def */,
DE3985780CB8ADC800223765 /* ASTConsumers.h */,
DE39857A0CB8ADCB00223765 /* ASTConsumers.cpp */,
35A057E60EAE2DDD0069249F /* CacheTokens.cpp */,
DE38CF150D8C9DE000A273B6 /* DiagChecker.cpp */,
72D16C210D9975EA00E6DA4A /* HTMLPrint.cpp */,
DE5932CF0AD60FF400BC794C /* PrintParserCallbacks.cpp */,

8
clang/include/clang/AST/Expr.h
View File

@ -1410,11 +1410,17 @@ public:
class InitListExpr : public Expr {
std::vector<Stmt *> InitExprs;
SourceLocation LBraceLoc, RBraceLoc;
/// HadDesignators - Return true if there were any designators in this
/// init list expr. FIXME: this should be replaced by storing the designators
/// somehow and updating codegen.
bool HadDesignators;
public:
InitListExpr(SourceLocation lbraceloc, Expr **initexprs, unsigned numinits,
SourceLocation rbraceloc);
SourceLocation rbraceloc, bool HadDesignators);
unsigned getNumInits() const { return InitExprs.size(); }
bool hadDesignators() const { return HadDesignators; }
const Expr* getInit(unsigned Init) const {
assert(Init < getNumInits() && "Initializer access out of range!");

11
clang/lib/AST/Expr.cpp
View File

@ -204,13 +204,12 @@ const char *BinaryOperator::getOpcodeStr(Opcode Op) {
}
InitListExpr::InitListExpr(SourceLocation lbraceloc,
Expr **initexprs, unsigned numinits,
SourceLocation rbraceloc)
Expr **initExprs, unsigned numInits,
SourceLocation rbraceloc, bool hadDesignators)
: Expr(InitListExprClass, QualType()),
LBraceLoc(lbraceloc), RBraceLoc(rbraceloc)
{
for (unsigned i = 0; i != numinits; i++)
InitExprs.push_back(initexprs[i]);
LBraceLoc(lbraceloc), RBraceLoc(rbraceloc), HadDesignators(hadDesignators) {
InitExprs.insert(InitExprs.end(), initExprs, initExprs+numInits);
}
/// getFunctionType - Return the underlying function type for this block.

4
clang/lib/Sema/SemaExpr.cpp
View File

@ -22,6 +22,7 @@
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/Parse/DeclSpec.h"
#include "clang/Parse/Designator.h"
#include "clang/Parse/Scope.h"
using namespace clang;
@ -1260,7 +1261,8 @@ ActOnInitList(SourceLocation LBraceLoc, ExprTy **initlist, unsigned NumInit,
// Semantic analysis for initializers is done by ActOnDeclarator() and
// CheckInitializer() - it requires knowledge of the object being intialized.
InitListExpr *E = new InitListExpr(LBraceLoc, InitList, NumInit, RBraceLoc);
InitListExpr *E = new InitListExpr(LBraceLoc, InitList, NumInit, RBraceLoc,
Designators.hasAnyDesignators());
E->setType(Context.VoidTy); // FIXME: just a place holder for now.
return E;
}

3
clang/lib/Sema/SemaInit.cpp
View File

@ -87,7 +87,8 @@ void InitListChecker::CheckImplicitInitList(InitListExpr *ParentIList,
// Synthesize an "implicit" InitListExpr (marked by the invalid source locs).
InitListExpr *ILE = new InitListExpr(SourceLocation(),
&InitExprs[0], InitExprs.size(),
SourceLocation());
SourceLocation(),
ParentIList->hadDesignators());
ILE->setType(T);
// Modify the parent InitListExpr to point to the implicit InitListExpr.