[clang] 6cdaf7e - APINotes: remove accidentally committed downstream changes

Saleem Abdulrasool via cfe-commits cfe-commits at lists.llvm.org
Thu Aug 17 10:05:22 PDT 2023


Author: Saleem Abdulrasool
Date: 2023-08-17T10:05:10-07:00
New Revision: 6cdaf7e6ad53f882d1b3a36f05c0e145db1d7051

URL: https://github.com/llvm/llvm-project/commit/6cdaf7e6ad53f882d1b3a36f05c0e145db1d7051
DIFF: https://github.com/llvm/llvm-project/commit/6cdaf7e6ad53f882d1b3a36f05c0e145db1d7051.diff

LOG: APINotes: remove accidentally committed downstream changes

Remove the inferAsMember downstream changes which are not meant to be
part of the APINotes support.

Added: 
    

Modified: 
    clang/lib/APINotes/APINotesWriter.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/APINotes/APINotesWriter.cpp b/clang/lib/APINotes/APINotesWriter.cpp
index ab9cc284e28c5a..1a3d66a547f6ad 100644
--- a/clang/lib/APINotes/APINotesWriter.cpp
+++ b/clang/lib/APINotes/APINotesWriter.cpp
@@ -30,10 +30,6 @@ class APINotesWriter::Implementation {
   /// Scratch space for bitstream writing.
   llvm::SmallVector<uint64_t, 64> Scratch;
 
-#if defined(__APPLE__) && defined(SWIFT_DOWNSTREAM)
-  bool SwiftImportAsMember = false;
-#endif
-
   /// Mapping from strings to identifier IDs.
   llvm::StringMap<IdentifierID> IdentifierIDs;
 
@@ -227,13 +223,6 @@ void APINotesWriter::Implementation::writeControlBlock(
   control_block::ModuleNameLayout ModuleName(Stream);
   ModuleName.emit(Scratch, this->ModuleName);
 
-#if defined(__APPLE__) && defined(SWIFT_DOWNSTREAM)
-  if (SwiftInferImportAsMember) {
-    control_block::ModuleOptionsLayout ModuleOptions(Stream);
-    ModuleOptions.emit(Scratch, SwiftInferImportAsMember);
-  }
-#endif
-
   if (SourceFile) {
     control_block::SourceFileLayout SourceFile(Stream);
     SourceFile.emit(Scratch, this->SourceFile->getSize(),


        


More information about the cfe-commits mailing list