add BSI::dump and remove conversion functions for BoundsSafetyKind

Author: hnrklssn

clang/include/clang/APINotes/Types.h

@@ -304,7 +304,7 @@ inline bool operator!=(const ContextInfo &LHS, const ContextInfo &RHS) {
 class BoundsSafetyInfo {
 public:
   enum class BoundsSafetyKind {
-    CountedBy,
+    CountedBy = 0,
     CountedByOrNull,
     SizedBy,
     SizedByOrNull,
@@ -354,6 +354,8 @@ class BoundsSafetyInfo {
   }
 
   friend bool operator==(const BoundsSafetyInfo &, const BoundsSafetyInfo &);
+
+  LLVM_DUMP_METHOD void dump(llvm::raw_ostream &OS) const;
 };
 
 inline bool operator==(const BoundsSafetyInfo &LHS,

clang/lib/APINotes/APINotesReader.cpp

@@ -323,23 +323,6 @@ class FieldTableInfo
 };
 
 /* TO_UPSTREAM(BoundsSafety) ON */
-BoundsSafetyInfo::BoundsSafetyKind readKindFlag(uint8_t kind) {
-  switch (kind) {
-  case 0x00:
-    return BoundsSafetyInfo::BoundsSafetyKind::CountedBy;
-  case 0x01:
-    return BoundsSafetyInfo::BoundsSafetyKind::CountedByOrNull;
-  case 0x02:
-    return BoundsSafetyInfo::BoundsSafetyKind::SizedBy;
-  case 0x03:
-    return BoundsSafetyInfo::BoundsSafetyKind::SizedByOrNull;
-  case 0x04:
-    return BoundsSafetyInfo::BoundsSafetyKind::EndedBy;
-  default:
-    llvm_unreachable("invalid bounds safety kind");
-  }
-}
-
 /// Read serialized BoundsSafetyInfo.
 void ReadBoundsSafetyInfo(const uint8_t *&Data, BoundsSafetyInfo &Info) {
   uint8_t Payload = endian::readNext<uint8_t, llvm::endianness::little>(Data);
@@ -352,7 +335,9 @@ void ReadBoundsSafetyInfo(const uint8_t *&Data, BoundsSafetyInfo &Info) {
 
   if (Payload & 0x01) {
     uint8_t Kind = (Payload >> 1) & 0x7;
-    Info.setKindAudited(readKindFlag(Kind));
+    assert(Kind >= (uint8_t)BoundsSafetyInfo::BoundsSafetyKind::CountedBy);
+    assert(Kind <= (uint8_t)BoundsSafetyInfo::BoundsSafetyKind::EndedBy);
+    Info.setKindAudited((BoundsSafetyInfo::BoundsSafetyKind)Kind);
   }
 
   uint16_t ExternalBoundsLen =

clang/lib/APINotes/APINotesTypes.cpp

@@ -61,6 +61,34 @@ LLVM_DUMP_METHOD void ObjCPropertyInfo::dump(llvm::raw_ostream &OS) const {
   OS << '\n';
 }
 
+LLVM_DUMP_METHOD void BoundsSafetyInfo::dump(llvm::raw_ostream &OS) const {
+  if (KindAudited) {
+    assert((BoundsSafetyKind)Kind >= BoundsSafetyKind::CountedBy);
+    assert((BoundsSafetyKind)Kind <= BoundsSafetyKind::EndedBy);
+    switch ((BoundsSafetyKind)Kind) {
+    case BoundsSafetyKind::CountedBy:
+      OS << "[counted_by] ";
+      break;
+    case BoundsSafetyKind::CountedByOrNull:
+      OS << "[counted_by_or_null] ";
+      break;
+    case BoundsSafetyKind::SizedBy:
+      OS << "[sized_by] ";
+      break;
+    case BoundsSafetyKind::SizedByOrNull:
+      OS << "[sized_by_or_null] ";
+      break;
+    case BoundsSafetyKind::EndedBy:
+      OS << "[ended_by] ";
+      break;
+    }
+  }
+  if (LevelAudited)
+    OS << "Level: " << Level << " ";
+  OS << "ExternalBounds: "
+     << (ExternalBounds.empty() ? "<missing>" : ExternalBounds) << '\n';
+}
+
 LLVM_DUMP_METHOD void ParamInfo::dump(llvm::raw_ostream &OS) const {
   static_cast<const VariableInfo &>(*this).dump(OS);
   if (NoEscapeSpecified)
@@ -69,6 +97,8 @@ LLVM_DUMP_METHOD void ParamInfo::dump(llvm::raw_ostream &OS) const {
     OS << (Lifetimebound ? "[Lifetimebound] " : "");
   OS << "RawRetainCountConvention: " << RawRetainCountConvention << ' ';
   OS << '\n';
+  if (BoundsSafety)
+    BoundsSafety->dump(OS);
 }
 
 LLVM_DUMP_METHOD void FunctionInfo::dump(llvm::raw_ostream &OS) const {

clang/lib/APINotes/APINotesWriter.cpp

@@ -1076,27 +1076,12 @@ void APINotesWriter::Implementation::writeGlobalVariableBlock(
 
 /* TO_UPSTREAM(BoundsSafety) ON */
 namespace {
-uint8_t getKindFlag(BoundsSafetyInfo::BoundsSafetyKind kind) {
-  switch (kind) {
-  case BoundsSafetyInfo::BoundsSafetyKind::CountedBy:
-    return 0x00;
-  case BoundsSafetyInfo::BoundsSafetyKind::CountedByOrNull:
-    return 0x01;
-  case BoundsSafetyInfo::BoundsSafetyKind::SizedBy:
-    return 0x02;
-  case BoundsSafetyInfo::BoundsSafetyKind::SizedByOrNull:
-    return 0x03;
-  case BoundsSafetyInfo::BoundsSafetyKind::EndedBy:
-    return 0x04;
-  }
-}
-
 void emitBoundsSafetyInfo(raw_ostream &OS, const BoundsSafetyInfo &BSI) {
   llvm::support::endian::Writer writer(OS, llvm::endianness::little);
   uint8_t flags = 0;
   if (auto kind = BSI.getKind()) {
     flags |= 0x01;                    // 1 bit
-    flags |= getKindFlag(*kind) << 1; // 3 bits
+    flags |= (uint8_t)*kind << 1;     // 3 bits
   }
   flags <<= 4;
   if (auto level = BSI.getLevel()) {

clang/lib/Sema/SemaAPINotes.cpp

@@ -427,6 +427,8 @@ static void applyBoundsSafety(Sema &S, ValueDecl *D,
 
     std::string AttrName;
     AttributeCommonInfo::Kind Kind;
+    assert(*Info.getKind() >= BoundsSafetyKind::CountedBy);
+    assert(*Info.getKind() <= BoundsSafetyKind::EndedBy);
     switch (*Info.getKind()) {
     case BoundsSafetyKind::CountedBy:
       AttrName = "__counted_by";