replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rvalue references for *this: tentative parsing and template argument deduction. 

llvm-svn: 124295
This commit is contained in:
Douglas Gregor 2011-01-26 16:50:54 +00:00
parent 1d042091d3
commit 54e462ac6e
3 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Parse/ParseTentative.cpp
View File

@ -1222,6 +1222,10 @@ Parser::TPResult Parser::TryParseFunctionDeclarator() {
Tok.is(tok::kw_restrict) )
ConsumeToken();
// ref-qualifier[opt]
if (Tok.is(tok::amp) || Tok.is(tok::ampamp))
ConsumeToken();
// exception-specification
if (Tok.is(tok::kw_throw)) {
ConsumeToken();

10
clang/lib/Sema/SemaTemplateDeduction.cpp
View File

@ -1154,11 +1154,11 @@ DeduceTemplateArguments(Sema &S,
const FunctionProtoType *FunctionProtoParam =
cast<FunctionProtoType>(Param);
if (FunctionProtoParam->getTypeQuals() !=
FunctionProtoArg->getTypeQuals())
return Sema::TDK_NonDeducedMismatch;
if (FunctionProtoParam->isVariadic() != FunctionProtoArg->isVariadic())
if (FunctionProtoParam->getTypeQuals()
!= FunctionProtoArg->getTypeQuals() ||
FunctionProtoParam->getRefQualifier()
!= FunctionProtoArg->getRefQualifier() ||
FunctionProtoParam->isVariadic() != FunctionProtoArg->isVariadic())
return Sema::TDK_NonDeducedMismatch;
// Check return types.

47
clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.type/p8-0x.cpp Normal file
View File

@ -0,0 +1,47 @@
// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
// Deductions specific to C++0x.
template<typename T>
struct member_pointer_kind {
static const unsigned value = 0;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...)> {
static const unsigned value = 1;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...) &> {
static const unsigned value = 2;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...) &&> {
static const unsigned value = 3;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...) const> {
static const unsigned value = 4;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...) const &> {
static const unsigned value = 5;
};
template<class C, typename R, typename ...Args>
struct member_pointer_kind<R (C::*)(Args...) const &&> {
static const unsigned value = 6;
};
struct X { };
static_assert(member_pointer_kind<int (X::*)(int)>::value == 1, "");
static_assert(member_pointer_kind<int (X::*)(int) &>::value == 2, "");
static_assert(member_pointer_kind<int (X::*)(int) &&>::value == 3, "");
static_assert(member_pointer_kind<int (X::*)(int) const>::value == 4, "");
static_assert(member_pointer_kind<int (X::*)(int) const&>::value == 5, "");
static_assert(member_pointer_kind<int (X::*)(int) const&&>::value == 6, "");