Abstract serialization fixes for the Apple Clang changes.

Author: rjmccall

clang/include/clang/AST/AbstractBasicReader.h

@@ -178,9 +178,9 @@ class DataStreamBasicReader : public BasicReaderBase<Impl> {
   }
 
   Qualifiers readQualifiers() {
-    static_assert(sizeof(Qualifiers().getAsOpaqueValue()) <= sizeof(uint32_t),
+    static_assert(sizeof(Qualifiers().getAsOpaqueValue()) <= sizeof(uint64_t),
                   "update this if the value size changes");
-    uint32_t value = asImpl().readUInt32();
+    uint64_t value = asImpl().readUInt64();
     return Qualifiers::fromOpaqueValue(value);
   }
 

clang/include/clang/AST/AbstractBasicWriter.h

@@ -164,9 +164,9 @@ class DataStreamBasicWriter : public BasicWriterBase<Impl> {
   }
 
   void writeQualifiers(Qualifiers value) {
-    static_assert(sizeof(value.getAsOpaqueValue()) <= sizeof(uint32_t),
+    static_assert(sizeof(value.getAsOpaqueValue()) <= sizeof(uint64_t),
                   "update this if the value size changes");
-    asImpl().writeUInt32(value.getAsOpaqueValue());
+    asImpl().writeUInt64(value.getAsOpaqueValue());
   }
 
   void writeExceptionSpecInfo(

clang/lib/Serialization/ASTReaderDecl.cpp

@@ -2731,7 +2731,7 @@ class AttrReader {
 
   Expr *readExpr() { return Reader.readExpr(); }
 
-  Attr *readAttr() { return Reader->ReadAttr(*F, Record, Idx); }
+  Attr *readAttr() { return Reader.readAttr(); }
 
   std::string readString() {
     return Reader.readString();

clang/lib/Serialization/ASTReaderStmt.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Serialization/ASTRecordReader.h"
-#include "clang/AST/ASTConcept.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/AttrIterator.h"
 #include "clang/AST/Decl.h"
@@ -1860,7 +1859,7 @@ void ASTStmtReader::VisitFunctionParmPackExpr(FunctionParmPackExpr *E) {
 void ASTStmtReader::VisitMaterializeTemporaryExpr(MaterializeTemporaryExpr *E) {
   VisitExpr(E);
   E->State = Record.readSubExpr();
-  auto *VD = ReadDeclAs<ValueDecl>();
+  auto *VD = readDeclAs<ValueDecl>();
   unsigned ManglingNumber = Record.readInt();
   E->setExtendingDecl(VD, ManglingNumber);
 }

clang/utils/TableGen/ASTTableGen.h

@@ -141,8 +141,6 @@ class WrappedRecord {
 /// Anything in the AST that has properties.
 class HasProperties : public WrappedRecord {
 public:
-  static constexpr llvm::StringRef ClassName = HasPropertiesClassName;
-
   HasProperties(llvm::Record *record = nullptr) : WrappedRecord(record) {}
 
   llvm::StringRef getName() const;