summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ItaniumMangle.cpp
diff options
context:
space:
mode:
authorMikael Nilsson <mikael.nilsson@arm.com>2018-12-12 15:06:16 +0000
committerMikael Nilsson <mikael.nilsson@arm.com>2018-12-12 15:06:16 +0000
commit90646732bf1366f9df93fd41a58323cb8f8e0fce (patch)
tree4c48633a6081a378faf2e048c37fec998eecb3cf /clang/lib/AST/ItaniumMangle.cpp
parentc92fc3c8bca3c1f8ffdd3aa7606061927d64b940 (diff)
downloadbcm5719-llvm-90646732bf1366f9df93fd41a58323cb8f8e0fce.tar.gz
bcm5719-llvm-90646732bf1366f9df93fd41a58323cb8f8e0fce.zip
Revert "[OpenCL] Add generic AS to 'this' pointer"
Reverting because the patch broke lldb. llvm-svn: 348931
Diffstat (limited to 'clang/lib/AST/ItaniumMangle.cpp')
-rw-r--r--clang/lib/AST/ItaniumMangle.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index d8d56216b11..a651bdb2d00 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -1503,7 +1503,8 @@ void CXXNameMangler::mangleNestedName(const NamedDecl *ND,
Out << 'N';
if (const CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(ND)) {
- Qualifiers MethodQuals = Method->getTypeQualifiers();
+ Qualifiers MethodQuals =
+ Qualifiers::fromCVRUMask(Method->getTypeQualifiers());
// We do not consider restrict a distinguishing attribute for overloading
// purposes so we must not mangle it.
MethodQuals.removeRestrict();
@@ -2724,7 +2725,7 @@ void CXXNameMangler::mangleType(const FunctionProtoType *T) {
// Mangle CV-qualifiers, if present. These are 'this' qualifiers,
// e.g. "const" in "int (A::*)() const".
- mangleQualifiers(T->getTypeQuals());
+ mangleQualifiers(Qualifiers::fromCVRUMask(T->getTypeQuals()));
// Mangle instantiation-dependent exception-specification, if present,
// per cxx-abi-dev proposal on 2016-10-11.
OpenPOWER on IntegriCloud