diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Basic/Builtins.def | 4 | ||||
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def index af233b81e0a..3afdaf5b0eb 100644 --- a/clang/include/clang/Basic/Builtins.def +++ b/clang/include/clang/Basic/Builtins.def @@ -46,8 +46,8 @@ // U -> unsigned // // Types may be postfixed with the following modifiers: -// * -> pointer -// & -> reference +// * -> pointer (optionally followed by an address space number) +// & -> reference (optionally followed by an address space number) // C -> const // D -> volatile diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 079c16ac6b2..ea121165fc2 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -4973,13 +4973,24 @@ static QualType DecodeTypeFromStr(const char *&Str, ASTContext &Context, Done = false; while (!Done) { - switch (*Str++) { + switch (char c = *Str++) { default: Done = true; --Str; break; case '*': - Type = Context.getPointerType(Type); - break; case '&': - Type = Context.getLValueReferenceType(Type); + { + // Both pointers and references can have their pointee types + // qualified with an address space. + char *End; + unsigned AddrSpace = strtoul(Str, &End, 10); + if (End != Str && AddrSpace != 0) { + Type = Context.getAddrSpaceQualType(Type, AddrSpace); + Str = End; + } + } + if (c == '*') + Type = Context.getPointerType(Type); + else + Type = Context.getLValueReferenceType(Type); break; // FIXME: There's no way to have a built-in with an rvalue ref arg. case 'C': |
