maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

CXXThisScopeRAII objects aren't free, don't compute one if it's unused. 

llvm-svn: 156987
This commit is contained in:
Benjamin Kramer 2012-05-17 12:01:52 +00:00
parent 0fc33af2a7
commit 1d373c6517
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Parse/ParseCXXInlineMethods.cpp
View File

@ -459,7 +459,7 @@ void Parser::ParseLexedMemberInitializers(ParsingClass &Class) {
Actions.ActOnStartDelayedMemberDeclarations(getCurScope(), Actions.ActOnStartDelayedMemberDeclarations(getCurScope(),
Class.TagOrTemplate); Class.TagOrTemplate);
{ if (!Class.LateParsedDeclarations.empty()) {
// C++11 [expr.prim.general]p4: // C++11 [expr.prim.general]p4:
// Otherwise, if a member-declarator declares a non-static data member // Otherwise, if a member-declarator declares a non-static data member
// (9.2) of a class X, the expression this is a prvalue of type "pointer // (9.2) of a class X, the expression this is a prvalue of type "pointer

2
clang/lib/Parse/ParseDecl.cpp
View File

@ -742,7 +742,7 @@ void Parser::ParseLexedAttributes(ParsingClass &Class) {
if (!AlreadyHasClassScope) if (!AlreadyHasClassScope)
Actions.ActOnStartDelayedMemberDeclarations(getCurScope(), Actions.ActOnStartDelayedMemberDeclarations(getCurScope(),
Class.TagOrTemplate); Class.TagOrTemplate);
{ if (!Class.LateParsedDeclarations.empty()) {
// Allow 'this' within late-parsed attributes. // Allow 'this' within late-parsed attributes.
Sema::CXXThisScopeRAII ThisScope(Actions, Class.TagOrTemplate, Sema::CXXThisScopeRAII ThisScope(Actions, Class.TagOrTemplate,
/*TypeQuals=*/0); /*TypeQuals=*/0);

2
clang/lib/Sema/SemaTemplateInstantiate.cpp
View File

@ -1942,7 +1942,7 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation,
CheckCompletedCXXClass(Instantiation); CheckCompletedCXXClass(Instantiation);
// Attach any in-class member initializers now the class is complete. // Attach any in-class member initializers now the class is complete.
{ if (!FieldsWithMemberInitializers.empty()) {
// C++11 [expr.prim.general]p4: // C++11 [expr.prim.general]p4:
// Otherwise, if a member-declarator declares a non-static data member // Otherwise, if a member-declarator declares a non-static data member
// (9.2) of a class X, the expression this is a prvalue of type "pointer // (9.2) of a class X, the expression this is a prvalue of type "pointer