Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

include/swift/Serialization/ModuleFile.h

@@ -419,17 +419,16 @@ class ModuleFile
     /// Whether or not ImportDecls is valid.
     unsigned ComputedImportDecls : 1;
 
-    /// Whether this module file can be used, and what's wrong if not.
-    unsigned Status : 4;
+    /// Whether an error has been detected setting up this module file.
+    unsigned HasError : 1;
 
     // Explicitly pad out to the next word boundary.
     unsigned : 0;
   } Bits = {};
   static_assert(sizeof(ModuleBits) <= 8, "The bit set should be small");
 
-  void setStatus(Status status) {
-    Bits.Status = static_cast<unsigned>(status);
-    assert(status == getStatus() && "not enough bits for status");
+  bool hasError() const {
+    return Bits.HasError;
   }
 
   void setEntryPointClassID(serialization::DeclID DID) {
@@ -449,25 +448,24 @@ class ModuleFile
              serialization::ExtendedValidationInfo *extInfo);
 
 public:
-  /// Change the status of the current module. Default argument marks the module
-  /// as being malformed.
-  Status error(Status issue = Status::Malformed) {
+  /// Change the status of the current module.
+  Status error(Status issue) {
     assert(issue != Status::Valid);
-    if (FileContext && issue == Status::Malformed) {
-      // This would normally be an assertion but it's more useful to print the
-      // PrettyStackTrace here even in no-asserts builds. Malformed modules are
-      // generally unrecoverable.
-      fatal(llvm::make_error<llvm::StringError>(
-          "(see \"While...\" info below)", llvm::inconvertibleErrorCode()));
-    }
-    setStatus(issue);
-    return getStatus();
+    assert((issue != Status::Malformed || !FileContext) &&
+           "too late to complain about the well-formedness of the module");
+    Bits.HasError = true;
+    return issue;
   }
 
   /// Emits one last diagnostic, logs the error, and then aborts for the stack
   /// trace.
   LLVM_ATTRIBUTE_NORETURN void fatal(llvm::Error error);
 
+  LLVM_ATTRIBUTE_NORETURN void fatal() {
+    fatal(llvm::make_error<llvm::StringError>(
+        "(see \"While...\" info below)", llvm::inconvertibleErrorCode()));
+  }
+
   ASTContext &getContext() const {
     assert(FileContext && "no associated context yet");
     return FileContext->getParentModule()->getASTContext();
@@ -620,9 +618,6 @@ class ModuleFile
     theModule.reset(new ModuleFile(std::move(moduleInputBuffer),
                                    std::move(moduleDocInputBuffer),
                                    isFramework, info, extInfo));
-    assert(info.status == Status::Valid ||
-           info.status == theModule->getStatus());
-    info.status = theModule->getStatus();
     return info;
   }
 
@@ -650,16 +645,12 @@ class ModuleFile
   Status associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
                                   bool treatAsPartialModule);
 
-  /// Checks whether this module can be used.
-  Status getStatus() const {
-    return static_cast<Status>(Bits.Status);
-  }
-
   /// Transfers ownership of a buffer that might contain source code where
   /// other parts of the compiler could have emitted diagnostics, to keep them
   /// alive even if the ModuleFile is destroyed.
   ///
-  /// Should only be called when getStatus() indicates a failure.
+  /// Should only be called when a failure has been reported from
+  /// ModuleFile::load or ModuleFile::associateWithFileContext.
   std::unique_ptr<llvm::MemoryBuffer> takeBufferForDiagnostics();
 
   /// Returns the list of modules this module depends on.