[NFC] Improve deserialization for invalid attrs

As well as adding a filename to the message, if one is available.

Author: beccadax

lib/Serialization/Deserialization.cpp

@@ -149,6 +149,8 @@ const char ExtensionError::ID = '\0';
 void ExtensionError::anchor() {}
 const char DeclAttributesDidNotMatch::ID = '\0';
 void DeclAttributesDidNotMatch::anchor() {}
+const char InvalidRecordKindError::ID = '\0';
+void InvalidRecordKindError::anchor() {}
 
 /// Skips a single record in the bitstream.
 ///
@@ -432,7 +434,7 @@ SILLayout *ModuleFile::readSILLayout(llvm::BitstreamCursor &Cursor) {
     return SILLayout::get(getContext(), canSig, fields, capturesGenerics);
   }
   default:
-    fatal();
+    fatal(llvm::make_error<InvalidRecordKindError>(kind));
   }
 }
 
@@ -503,7 +505,7 @@ ProtocolConformanceDeserializer::read(
 
   // Not a protocol conformance.
   default:
-    MF.fatal();
+    MF.fatal(llvm::make_error<InvalidRecordKindError>(kind));
   }
 }
 
@@ -5062,7 +5064,7 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
 
       default:
         // We don't know how to deserialize this kind of attribute.
-        MF.fatal();
+        MF.fatal(llvm::make_error<InvalidRecordKindError>(recordID));
       }
 
       if (!skipAttr) {
@@ -5188,7 +5190,7 @@ DeclDeserializer::getDeclCheckedImpl(
 
   default:
     // We don't know how to deserialize this kind of decl.
-    MF.fatal();
+    MF.fatal(llvm::make_error<InvalidRecordKindError>(recordID));
   }
 }
 

lib/Serialization/DeserializationErrors.h

@@ -445,6 +445,32 @@ class DeclAttributesDidNotMatch : public llvm::ErrorInfo<DeclAttributesDidNotMat
   }
 };
 
+class InvalidRecordKindError :
+    public llvm::ErrorInfo<InvalidRecordKindError, DeclDeserializationError> {
+  friend ErrorInfo;
+  static const char ID;
+  void anchor() override;
+
+  unsigned recordKind;
+
+public:
+  explicit InvalidRecordKindError(unsigned kind) {
+    this->recordKind = kind;
+  }
+
+  void log(raw_ostream &OS) const override {
+    OS << "don't know how to deserialize record with code " << recordKind;
+    if (recordKind >= decls_block::SILGenName_DECL_ATTR)
+      OS << " (attribute kind "
+         << recordKind - decls_block::SILGenName_DECL_ATTR << ")";
+    OS << "; this may be a compiler bug";
+  }
+
+  std::error_code convertToErrorCode() const override {
+    return llvm::inconvertibleErrorCode();
+  }
+};
+
 LLVM_NODISCARD
 static inline std::unique_ptr<llvm::ErrorInfoBase>
 takeErrorInfo(llvm::Error error) {

lib/Serialization/ModuleFileSharedCore.cpp

@@ -582,6 +582,8 @@ void ModuleFileSharedCore::outputDiagnosticInfo(llvm::raw_ostream &os) const {
       << "'";
   if (Bits.IsAllowModuleWithCompilerErrorsEnabled)
     os << " (built with -experimental-allow-module-with-compiler-errors)";
+  if (ModuleInputBuffer)
+    os << " at '" << ModuleInputBuffer->getBufferIdentifier() << "'";
 }
 
 ModuleFileSharedCore::~ModuleFileSharedCore() { }