summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ASTContext.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-21 22:15:06 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-21 22:15:06 +0000
commit36c569fb33842342d293388eef57fdd8e51e4d60 (patch)
tree007dcbe095ea7d3a20e8f35d7f720ad7c3b6ef52 /clang/lib/AST/ASTContext.cpp
parent7126183006ec694211afcf3b82b92e96afee01bc (diff)
downloadbcm5719-llvm-36c569fb33842342d293388eef57fdd8e51e4d60.tar.gz
bcm5719-llvm-36c569fb33842342d293388eef57fdd8e51e4d60.zip
Eliminate the default arguments to ASTContext::getFunctionType(),
fixing up a few callers that thought they were propagating NoReturn information but were in fact saying something about exception specifications. llvm-svn: 96766
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
-rw-r--r--clang/lib/AST/ASTContext.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 74212fe785d..e8b84c65dd6 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -4408,7 +4408,8 @@ QualType ASTContext::mergeFunctionTypes(QualType lhs, QualType rhs) {
if (allRTypes) return rhs;
return getFunctionType(retType, proto->arg_type_begin(),
proto->getNumArgs(), proto->isVariadic(),
- proto->getTypeQuals(), NoReturn, lcc);
+ proto->getTypeQuals(),
+ false, false, 0, 0, NoReturn, lcc);
}
if (allLTypes) return lhs;
@@ -4895,8 +4896,11 @@ QualType ASTContext::GetBuiltinType(unsigned id,
// handle untyped/variadic arguments "T c99Style();" or "T cppStyle(...);".
if (ArgTypes.size() == 0 && TypeStr[0] == '.')
return getFunctionNoProtoType(ResType);
+
+ // FIXME: Should we create noreturn types?
return getFunctionType(ResType, ArgTypes.data(), ArgTypes.size(),
- TypeStr[0] == '.', 0);
+ TypeStr[0] == '.', 0, false, false, 0, 0,
+ false, CC_Default);
}
QualType
OpenPOWER on IntegriCloud