[cfe-commits] r65694 - in /cfe/trunk: include/clang/Parse/Scope.h lib/Sema/Sema.cpp lib/Sema/Sema.h lib/Sema/SemaDecl.cpp lib/Sema/SemaDeclObjC.cpp lib/Sema/SemaExpr.cpp lib/Sema/SemaStmt.cpp test/Sema/block-labels.c
Steve Naroff
snaroff at apple.com
Sat Feb 28 08:48:46 PST 2009
Author: snaroff
Date: Sat Feb 28 10:48:43 2009
New Revision: 65694
URL: http://llvm.org/viewvc/llvm-project?rev=65694&view=rev
Log:
Fix <rdar://problem/6451399> problems with labels and blocks.
- Move the 'LabelMap' from Sema to Scope. To avoid layering problems, the second element is now a 'StmtTy *', which makes the LabelMap a bit more verbose to deal with.
- Add 'ActiveScope' to Sema. Managed by ActOnStartOfFunctionDef(), ObjCActOnStartOfMethodDef(), ActOnBlockStmtExpr().
- Changed ActOnLabelStmt(), ActOnGotoStmt(), ActOnAddrLabel(), and ActOnFinishFunctionBody() to use the new ActiveScope.
- Added FIXME to workaround in ActOnFinishFunctionBody() (for dealing with C++ nested functions).
Added:
cfe/trunk/test/Sema/block-labels.c
Modified:
cfe/trunk/include/clang/Parse/Scope.h
cfe/trunk/lib/Sema/Sema.cpp
cfe/trunk/lib/Sema/Sema.h
cfe/trunk/lib/Sema/SemaDecl.cpp
cfe/trunk/lib/Sema/SemaDeclObjC.cpp
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/lib/Sema/SemaStmt.cpp
Modified: cfe/trunk/include/clang/Parse/Scope.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Scope.h?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Scope.h (original)
+++ cfe/trunk/include/clang/Parse/Scope.h Sat Feb 28 10:48:43 2009
@@ -16,6 +16,7 @@
#include "clang/Parse/Action.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/DenseSet.h"
namespace clang {
@@ -130,6 +131,12 @@
UsingDirectivesTy UsingDirectives;
public:
+ /// LabelMap - This is a mapping from label identifiers to the LabelStmt for
+ /// it (which acts like the label decl in some ways). Forward referenced
+ /// labels have a LabelStmt created for them with a null location & SubStmt.
+ typedef llvm::DenseMap<IdentifierInfo*, Action::StmtTy*> LabelMapTy;
+ LabelMapTy LabelMap;
+
Scope(Scope *Parent, unsigned ScopeFlags) {
Init(Parent, ScopeFlags);
}
@@ -301,6 +308,7 @@
if (Flags & TemplateParamScope) TemplateParamParent = this;
DeclsInScope.clear();
UsingDirectives.clear();
+ LabelMap.clear();
Entity = 0;
}
};
Modified: cfe/trunk/lib/Sema/Sema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.cpp (original)
+++ cfe/trunk/lib/Sema/Sema.cpp Sat Feb 28 10:48:43 2009
@@ -169,6 +169,8 @@
StdNamespace = 0;
TUScope = 0;
+ ActiveScope = 0;
+
if (getLangOptions().CPlusPlus)
FieldCollector.reset(new CXXFieldCollector());
Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Sat Feb 28 10:48:43 2009
@@ -102,15 +102,14 @@
/// the active block object that represents it.
BlockSemaInfo *CurBlock;
+ /// ActiveScope - If inside of a function, method, or block definition,
+ /// this contains a pointer to the active scope that represents it.
+ Scope *ActiveScope;
+
/// PackContext - Manages the stack for #pragma pack. An alignment
/// of 0 indicates default alignment.
void *PackContext; // Really a "PragmaPackStack*"
- /// LabelMap - This is a mapping from label identifiers to the LabelStmt for
- /// it (which acts like the label decl in some ways). Forward referenced
- /// labels have a LabelStmt created for them with a null location & SubStmt.
- llvm::DenseMap<IdentifierInfo*, LabelStmt*> LabelMap;
-
llvm::SmallVector<SwitchStmt*, 8> SwitchStack;
/// ExtVectorDecls - This is a list all the extended vector types. This allows
@@ -2070,6 +2069,10 @@
/// arguments etc.
Scope *TheScope;
+ /// PrevFunctionScope - This is the scope for the enclosing function.
+ /// For global blocks, this will be null.
+ Scope *PrevFunctionScope;
+
/// ReturnType - This will get set to block result type, by looking at
/// return types, if any, in the block body.
Type *ReturnType;
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Sat Feb 28 10:48:43 2009
@@ -2444,6 +2444,8 @@
Decl *decl = static_cast<Decl*>(D);
FunctionDecl *FD = cast<FunctionDecl>(decl);
+ ActiveScope = FnBodyScope;
+
// See if this is a redefinition.
const FunctionDecl *Definition;
if (FD->getBody(Definition)) {
@@ -2586,17 +2588,29 @@
return 0;
}
PopDeclContext();
+
+ // FIXME: Temporary hack to workaround nested C++ functions. For example:
+ // class C2 {
+ // void f() {
+ // class LC1 {
+ // int m() { return 1; }
+ // };
+ // }
+ // };
+ if (ActiveScope == 0)
+ return D;
+
// Verify and clean out per-function state.
- bool HaveLabels = !LabelMap.empty();
+ bool HaveLabels = !ActiveScope->LabelMap.empty();
// Check goto/label use.
- for (llvm::DenseMap<IdentifierInfo*, LabelStmt*>::iterator
- I = LabelMap.begin(), E = LabelMap.end(); I != E; ++I) {
+ for (Scope::LabelMapTy::iterator I = ActiveScope->LabelMap.begin(),
+ E = ActiveScope->LabelMap.end(); I != E; ++I) {
// Verify that we have no forward references left. If so, there was a goto
// or address of a label taken, but no definition of it. Label fwd
// definitions are indicated with a null substmt.
- if (I->second->getSubStmt() == 0) {
- LabelStmt *L = I->second;
+ LabelStmt *L = static_cast<LabelStmt*>(I->second);
+ if (L->getSubStmt() == 0) {
// Emit error.
Diag(L->getIdentLoc(), diag::err_undeclared_label_use) << L->getName();
@@ -2618,7 +2632,8 @@
}
}
}
- LabelMap.clear();
+ // This reset is for both functions and methods.
+ ActiveScope = 0;
if (!Body) return D;
Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Sat Feb 28 10:48:43 2009
@@ -36,6 +36,8 @@
// Allow all of Sema to see that we are entering a method definition.
PushDeclContext(FnBodyScope, MDecl);
+ ActiveScope = FnBodyScope;
+
// Create Decl objects for each parameter, entrring them in the scope for
// binding to their use.
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Sat Feb 28 10:48:43 2009
@@ -4204,13 +4204,20 @@
SourceLocation LabLoc,
IdentifierInfo *LabelII) {
// Look up the record for this label identifier.
- LabelStmt *&LabelDecl = LabelMap[LabelII];
+ llvm::DenseMap<IdentifierInfo*, Action::StmtTy*>::iterator I =
+ ActiveScope->LabelMap.find(LabelII);
+ LabelStmt *LabelDecl;
+
// If we haven't seen this label yet, create a forward reference. It
// will be validated and/or cleaned up in ActOnFinishFunctionBody.
- if (LabelDecl == 0)
+ if (I == ActiveScope->LabelMap.end()) {
LabelDecl = new (Context) LabelStmt(LabLoc, LabelII, 0);
+ ActiveScope->LabelMap.insert(std::make_pair(LabelII, LabelDecl));
+ } else
+ LabelDecl = static_cast<LabelStmt *>(I->second);
+
// Create the AST node. The address of a label always has type 'void*'.
return new (Context) AddrLabelExpr(OpLoc, LabLoc, LabelDecl,
Context.getPointerType(Context.VoidTy));
@@ -4397,7 +4404,9 @@
// Add BSI to CurBlock.
BSI->PrevBlockInfo = CurBlock;
+ BSI->PrevFunctionScope = ActiveScope;
CurBlock = BSI;
+ ActiveScope = BlockScope;
BSI->ReturnType = 0;
BSI->TheScope = BlockScope;
@@ -4492,6 +4501,8 @@
PopDeclContext();
+ ActiveScope = CurBlock->PrevFunctionScope;
+
// Pop off CurBlock, handle nested blocks.
CurBlock = CurBlock->PrevBlockInfo;
Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=65694&r1=65693&r2=65694&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Sat Feb 28 10:48:43 2009
@@ -165,12 +165,19 @@
Sema::ActOnLabelStmt(SourceLocation IdentLoc, IdentifierInfo *II,
SourceLocation ColonLoc, StmtArg subStmt) {
Stmt *SubStmt = static_cast<Stmt*>(subStmt.release());
+
// Look up the record for this label identifier.
- LabelStmt *&LabelDecl = LabelMap[II];
+ Scope::LabelMapTy::iterator I = ActiveScope->LabelMap.find(II);
+ LabelStmt *LabelDecl;
+
// If not forward referenced or defined already, just create a new LabelStmt.
- if (LabelDecl == 0)
- return Owned(LabelDecl = new (Context) LabelStmt(IdentLoc, II, SubStmt));
+ if (I == ActiveScope->LabelMap.end()) {
+ LabelDecl = new (Context) LabelStmt(IdentLoc, II, SubStmt);
+ ActiveScope->LabelMap.insert(std::make_pair(II, LabelDecl));
+ return Owned(LabelDecl);
+ } else
+ LabelDecl = static_cast<LabelStmt *>(I->second);
assert(LabelDecl->getID() == II && "Label mismatch!");
@@ -672,11 +679,16 @@
return StmtError(Diag(GotoLoc, diag::err_goto_in_block));
// Look up the record for this label identifier.
- LabelStmt *&LabelDecl = LabelMap[LabelII];
+ Scope::LabelMapTy::iterator I = ActiveScope->LabelMap.find(LabelII);
- // If we haven't seen this label yet, create a forward reference.
- if (LabelDecl == 0)
+ LabelStmt *LabelDecl;
+
+ // If not forward referenced or defined already, just create a new LabelStmt.
+ if (I == ActiveScope->LabelMap.end()) {
LabelDecl = new (Context) LabelStmt(LabelLoc, LabelII, 0);
+ ActiveScope->LabelMap.insert(std::make_pair(LabelII, LabelDecl));
+ } else
+ LabelDecl = static_cast<LabelStmt *>(I->second);
return Owned(new (Context) GotoStmt(LabelDecl, GotoLoc, LabelLoc));
}
Added: cfe/trunk/test/Sema/block-labels.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/block-labels.c?rev=65694&view=auto
==============================================================================
--- cfe/trunk/test/Sema/block-labels.c (added)
+++ cfe/trunk/test/Sema/block-labels.c Sat Feb 28 10:48:43 2009
@@ -0,0 +1,17 @@
+// RUN: clang %s -verify -fblocks -fsyntax-only
+
+int a() {
+ A:if (1) xx();
+ return ^{A:return 1;}();
+}
+int b() {
+ A: return ^{int a; A:return 1;}();
+}
+
+int d() {
+ A: return ^{int a; A: a = ^{int a; A:return 1;}() + ^{int b; A:return 2;}(); return a; }();
+}
+
+int c() {
+ goto A; return ^{ A:return 1;}(); // expected-error {{use of undeclared label 'A'}}
+}
More information about the cfe-commits
mailing list