commit 90646732bf1366f9df93fd41a58323cb8f8e0fce
author Mikael Nilsson <mikael.nilsson@arm.com> Wed Dec 12 15:06:16 2018 +0000
committer Mikael Nilsson <mikael.nilsson@arm.com> Wed Dec 12 15:06:16 2018 +0000
tree 4c48633a6081a378faf2e048c37fec998eecb3cf
parent c92fc3c8bca3c1f8ffdd3aa7606061927d64b940

Revert "[OpenCL] Add generic AS to 'this' pointer"

Reverting because the patch broke lldb.

llvm-svn: 348931

clang/lib/Sema/SemaCodeComplete.cpp

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 6d310ca..7a8f31f 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -1028,7 +1028,8 @@
   if (HasObjectTypeQualifiers)
     if (const auto *Method = dyn_cast<CXXMethodDecl>(R.Declaration))
       if (Method->isInstance()) {
-        Qualifiers MethodQuals = Method->getTypeQualifiers();
+        Qualifiers MethodQuals =
+            Qualifiers::fromCVRMask(Method->getTypeQualifiers());
         if (ObjectTypeQualifiers == MethodQuals)
           R.Priority += CCD_ObjectQualifierMatch;
         else if (ObjectTypeQualifiers - MethodQuals) {
@@ -2742,17 +2743,17 @@
   // FIXME: Add ref-qualifier!
 
   // Handle single qualifiers without copying
-  if (Proto->getTypeQuals().hasOnlyConst()) {
+  if (Proto->getTypeQuals() == Qualifiers::Const) {
     Result.AddInformativeChunk(" const");
     return;
   }
 
-  if (Proto->getTypeQuals().hasOnlyVolatile()) {
+  if (Proto->getTypeQuals() == Qualifiers::Volatile) {
     Result.AddInformativeChunk(" volatile");
     return;
   }
 
-  if (Proto->getTypeQuals().hasOnlyRestrict()) {
+  if (Proto->getTypeQuals() == Qualifiers::Restrict) {
     Result.AddInformativeChunk(" restrict");
     return;
   }
@@ -3737,7 +3738,8 @@
   // the member function to filter/prioritize the results list.
   if (CXXMethodDecl *CurMethod = dyn_cast<CXXMethodDecl>(CurContext)) {
     if (CurMethod->isInstance()) {
-      Results.setObjectTypeQualifiers(CurMethod->getTypeQualifiers());
+      Results.setObjectTypeQualifiers(
+          Qualifiers::fromCVRMask(CurMethod->getTypeQualifiers()));
     }
   }