diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-06 10:52:04 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2011-03-06 10:52:04 +0000 |
| commit | 7c6c9e971cdad8cdf9fd33752afd489876188552 (patch) | |
| tree | a771326520e9369a699a1f7369c2ac331b6e954c /clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | d99609ae48ac1c440173e6d69cddca09c12c293d (diff) | |
| download | bcm5719-llvm-7c6c9e971cdad8cdf9fd33752afd489876188552.tar.gz bcm5719-llvm-7c6c9e971cdad8cdf9fd33752afd489876188552.zip | |
Reinstate r127112, "Propagate new-style exception spec information to ExtProtoInfo.", this time with the missing header.
llvm-svn: 127118
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 3473c877093..b668e173867 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2158,8 +2158,9 @@ TemplateDeclInstantiator::InitFunctionInstantiation(FunctionDecl *New, // Rebuild the function type FunctionProtoType::ExtProtoInfo EPI = Proto->getExtProtoInfo(); - EPI.HasExceptionSpec = Proto->hasExceptionSpec(); - EPI.HasAnyExceptionSpec = Proto->hasAnyExceptionSpec(); + EPI.ExceptionSpecType = Proto->hasExceptionSpec() ? + (Proto->hasAnyExceptionSpec() ? EST_DynamicAny : EST_Dynamic) : + EST_None; EPI.NumExceptions = Exceptions.size(); EPI.Exceptions = Exceptions.data(); EPI.ExtInfo = Proto->getExtInfo(); |
