Slight tweak to last commit: make sure to copy CVR qualifiers for fixed

pointer types.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65210 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index faaa5290962a58863b0a27a34168ae49f22f9bb0..51c479040b6088ced62e941b2cf8482a32c8c197 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1429,7 +1429,9 @@ static QualType TryToFixInvalidVariablyModifiedType(QualType T,
     QualType FixedType =
         TryToFixInvalidVariablyModifiedType(Pointee, Context, SizeIsNegative);
     if (FixedType.isNull()) return FixedType;
-    return Context.getPointerType(FixedType);
+    FixedType = Context.getPointerType(FixedType);
+    FixedType.setCVRQualifiers(T.getCVRQualifiers());
+    return FixedType;
   }
 
   const VariableArrayType* VLATy = dyn_cast<VariableArrayType>(T);