[cfe-commits] r120267 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaCXX/friend.cpp
Nico Weber
nicolasweber at gmx.de
Sun Nov 28 14:58:38 PST 2010
Author: nico
Date: Sun Nov 28 16:58:38 2010
New Revision: 120267
URL: http://llvm.org/viewvc/llvm-project?rev=120267&view=rev
Log:
Revert parts of r120266 that I did not mean to commit
Modified:
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/test/SemaCXX/friend.cpp
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=120267&r1=120266&r2=120267&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Sun Nov 28 16:58:38 2010
@@ -3839,8 +3839,8 @@
}
ExprResult Sema::BuildCXXDefaultArgExpr(SourceLocation CallLoc,
- FunctionDecl *FD,
- ParmVarDecl *Param) {
+ FunctionDecl *FD,
+ ParmVarDecl *Param) {
if (Param->hasUnparsedDefaultArg()) {
Diag(CallLoc,
diag::err_use_of_default_argument_to_function_declared_later) <<
@@ -3857,20 +3857,12 @@
MultiLevelTemplateArgumentList ArgList
= getTemplateInstantiationArgs(FD, 0, /*RelativeToPrimary=*/true);
- std::pair<const TemplateArgument *, unsigned> Innermost
+ std::pair<const TemplateArgument *, unsigned> Innermost
= ArgList.getInnermost();
InstantiatingTemplate Inst(*this, CallLoc, Param, Innermost.first,
Innermost.second);
- ExprResult Result;
- {
- // C++ [dcl.fct.default]p5:
- // The names in the [default argument] expression are bound, and
- // the semantic constraints are checked, at the point where the
- // default argument expression appears.
- ContextRAII SavedContext(*this, FD->getDeclContext());
- Result = SubstExpr(UninstExpr, ArgList);
- }
+ ExprResult Result = SubstExpr(UninstExpr, ArgList);
if (Result.isInvalid())
return ExprError();
Modified: cfe/trunk/test/SemaCXX/friend.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/friend.cpp?rev=120267&r1=120266&r2=120267&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/friend.cpp (original)
+++ cfe/trunk/test/SemaCXX/friend.cpp Sun Nov 28 16:58:38 2010
@@ -79,36 +79,3 @@
struct B { friend void B(); };
}
-
-// PR8479
-namespace test6_1 {
- class A {
- public:
- private:
- friend class vectorA;
- A() {}
- };
- class vectorA {
- public:
- vectorA(int i, const A& t = A()) {}
- };
- void f() {
- vectorA v(1);
- }
-}
-namespace test6_2 {
- template<class T>
- class vector {
- public:
- vector(int i, const T& t = T()) {}
- };
- class A {
- public:
- private:
- friend class vector<A>;
- A() {}
- };
- void f() {
- vector<A> v(1);
- }
-}
More information about the cfe-commits
mailing list