Merge pull request #16802 from aschwaighofer/swift5_sections

aschwaighofer · web-flow · commit c0af215fd808 · 2018-05-24T07:52:15.000-07:00
Rename swift sections from swift4 to swift5
diff --git a/include/swift/Reflection/ReflectionContext.h b/include/swift/Reflection/ReflectionContext.h
@@ -148,14 +148,14 @@ class ReflectionContext
 
     // The docs say "not all sections may be present." We'll succeed if ANY of
     // them are present. Not sure if that's the right thing to do.
-    auto FieldMd = findSection<FieldSection>(Header, "__swift4_fieldmd");
+    auto FieldMd = findSection<FieldSection>(Header, "__swift5_fieldmd");
     auto AssocTyMd =
-        findSection<AssociatedTypeSection>(Header, "__swift4_assocty");
+        findSection<AssociatedTypeSection>(Header, "__swift5_assocty");
     auto BuiltinTyMd =
-        findSection<BuiltinTypeSection>(Header, "__swift4_builtin");
-    auto CaptureMd = findSection<CaptureSection>(Header, "__swift4_capture");
-    auto TyperefMd = findSection<GenericSection>(Header, "__swift4_typeref");
-    auto ReflStrMd = findSection<GenericSection>(Header, "__swift4_reflstr");
+        findSection<BuiltinTypeSection>(Header, "__swift5_builtin");
+    auto CaptureMd = findSection<CaptureSection>(Header, "__swift5_capture");
+    auto TyperefMd = findSection<GenericSection>(Header, "__swift5_typeref");
+    auto ReflStrMd = findSection<GenericSection>(Header, "__swift5_reflstr");
 
     bool success = FieldMd.second || AssocTyMd.second || BuiltinTyMd.second ||
                    CaptureMd.second || TyperefMd.second || ReflStrMd.second;
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -2751,10 +2751,10 @@ llvm::Constant *IRGenModule::emitSwiftProtocols() {
   StringRef sectionName;
   switch (TargetInfo.OutputObjectFormat) {
   case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift4_protos, regular, no_dead_strip";
+    sectionName = "__TEXT, __swift5_protos, regular, no_dead_strip";
     break;
   case llvm::Triple::ELF:
-    sectionName = "swift4_protocols";
+    sectionName = "swift5_protocols";
     break;
   case llvm::Triple::COFF:
     sectionName = ".sw5prt$B";
@@ -2941,10 +2941,10 @@ llvm::Constant *IRGenModule::emitProtocolConformances() {
   StringRef sectionName;
   switch (TargetInfo.OutputObjectFormat) {
   case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift4_proto, regular, no_dead_strip";
+    sectionName = "__TEXT, __swift5_proto, regular, no_dead_strip";
     break;
   case llvm::Triple::ELF:
-    sectionName = "swift4_protocol_conformances";
+    sectionName = "swift5_protocol_conformances";
     break;
   case llvm::Triple::COFF:
     sectionName = ".sw5prtc$B";
@@ -2968,10 +2968,10 @@ llvm::Constant *IRGenModule::emitTypeMetadataRecords() {
   std::string sectionName;
   switch (TargetInfo.OutputObjectFormat) {
   case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift4_types, regular, no_dead_strip";
+    sectionName = "__TEXT, __swift5_types, regular, no_dead_strip";
     break;
   case llvm::Triple::ELF:
-    sectionName = "swift4_type_metadata";
+    sectionName = "swift5_type_metadata";
     break;
   case llvm::Triple::COFF:
     sectionName = ".sw5tymd$B";
@@ -3035,13 +3035,13 @@ llvm::Constant *IRGenModule::emitFieldDescriptors() {
   std::string sectionName;
   switch (TargetInfo.OutputObjectFormat) {
   case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift4_fieldmd, regular, no_dead_strip";
+    sectionName = "__TEXT, __swift5_fieldmd, regular, no_dead_strip";
     break;
   case llvm::Triple::ELF:
-    sectionName = "swift4_fieldmd";
+    sectionName = "swift5_fieldmd";
     break;
   case llvm::Triple::COFF:
-    sectionName = ".swift4_fieldmd";
+    sectionName = ".swift5_fieldmd";
     break;
   default:
     llvm_unreachable("Don't know how to emit field records table for "
diff --git a/lib/IRGen/GenReflection.cpp b/lib/IRGen/GenReflection.cpp
@@ -247,7 +247,7 @@ class ReflectionMetadataBuilder {
 
     // Others, such as capture descriptors, do not have a name.
     } else {
-      var = B.finishAndCreateGlobal("\x01l__swift4_reflection_descriptor",
+      var = B.finishAndCreateGlobal("\x01l__swift5_reflection_descriptor",
                                     Alignment(4), /*isConstant*/ true,
                                     llvm::GlobalValue::PrivateLinkage);
     }
@@ -766,12 +766,12 @@ static std::string getReflectionSectionName(IRGenModule &IGM,
     OS << ".sw5" << FourCC << "$B";
     break;
   case llvm::Triple::ELF:
-    OS << "swift4_" << LongName;
+    OS << "swift5_" << LongName;
     break;
   case llvm::Triple::MachO:
     assert(LongName.size() <= 7 &&
            "Mach-O section name length must be <= 16 characters");
-    OS << "__TEXT,__swift4_" << LongName << ", regular, no_dead_strip";
+    OS << "__TEXT,__swift5_" << LongName << ", regular, no_dead_strip";
     break;
   case llvm::Triple::Wasm:
     llvm_unreachable("web assembly object format is not supported.");
diff --git a/stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift b/stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift
@@ -107,12 +107,12 @@ internal func getSectionInfo(_ name: String,
 ///
 /// An image of interest must have the following sections in the __DATA
 /// segment:
-/// - __swift4_fieldmd
-/// - __swift4_assocty
-/// - __swift4_builtin
-/// - __swift4_capture
-/// - __swift4_typeref
-/// - __swift4_reflstr (optional, may have been stripped out)
+/// - __swift5_fieldmd
+/// - __swift5_assocty
+/// - __swift5_builtin
+/// - __swift5_capture
+/// - __swift5_typeref
+/// - __swift5_reflstr (optional, may have been stripped out)
 ///
 /// - Parameter i: The index of the loaded image as reported by Dyld.
 /// - Returns: A `ReflectionInfo` containing the locations of all of the
@@ -123,12 +123,12 @@ internal func getReflectionInfoForImage(atIndex i: UInt32) -> ReflectionInfo? {
     to: UnsafePointer<MachHeader>.self)
 
   let imageName = _dyld_get_image_name(i)!
-  let fieldmd = getSectionInfo("__swift4_fieldmd", header)
-  let assocty = getSectionInfo("__swift4_assocty", header)
-  let builtin = getSectionInfo("__swift4_builtin", header)
-  let capture = getSectionInfo("__swift4_capture", header)
-  let typeref = getSectionInfo("__swift4_typeref", header)
-  let reflstr = getSectionInfo("__swift4_reflstr", header)
+  let fieldmd = getSectionInfo("__swift5_fieldmd", header)
+  let assocty = getSectionInfo("__swift5_assocty", header)
+  let builtin = getSectionInfo("__swift5_builtin", header)
+  let capture = getSectionInfo("__swift5_capture", header)
+  let typeref = getSectionInfo("__swift5_typeref", header)
+  let reflstr = getSectionInfo("__swift5_reflstr", header)
   return ReflectionInfo(imageName: String(validatingUTF8: imageName)!,
                         fieldmd: fieldmd,
                         assocty: assocty,
diff --git a/stdlib/public/runtime/ImageInspectionCOFF.cpp b/stdlib/public/runtime/ImageInspectionCOFF.cpp
@@ -41,7 +41,7 @@ void swift::initializeProtocolLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &protocols =
-      sections->swift4_protocols;
+      sections->swift5_protocols;
     if (protocols.length)
       addImageProtocolsBlockCallback(reinterpret_cast<void *>(protocols.start),
                                      protocols.length);
@@ -56,7 +56,7 @@ void swift::initializeProtocolConformanceLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &conformances =
-        sections->swift4_protocol_conformances;
+        sections->swift5_protocol_conformances;
     if (conformances.length)
       addImageProtocolConformanceBlockCallback(reinterpret_cast<void *>(conformances.start),
                                                conformances.length);
@@ -71,7 +71,7 @@ void swift::initializeTypeMetadataRecordLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &type_metadata =
-        sections->swift4_type_metadata;
+        sections->swift5_type_metadata;
     if (type_metadata.length)
       addImageTypeMetadataRecordBlockCallback(reinterpret_cast<void *>(type_metadata.start),
                                               type_metadata.length);
@@ -85,7 +85,7 @@ void swift::initializeTypeMetadataRecordLookup() {
 void swift::initializeTypeFieldLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
-    const swift::MetadataSections::Range &fields = sections->swift4_fieldmd;
+    const swift::MetadataSections::Range &fields = sections->swift5_fieldmd;
     if (fields.length)
       addImageTypeFieldDescriptorBlockCallback(
           reinterpret_cast<void *>(fields.start), fields.length);
@@ -103,20 +103,20 @@ void swift_addNewDSOImage(const void *addr) {
 
   record(sections);
 
-  const auto &protocols_section = sections->swift4_protocols;
+  const auto &protocols_section = sections->swift5_protocols;
   const void *protocols =
       reinterpret_cast<void *>(protocols_section.start);
   if (protocols_section.length)
     addImageProtocolsBlockCallback(protocols, protocols_section.length);
 
-  const auto &protocol_conformances = sections->swift4_protocol_conformances;
+  const auto &protocol_conformances = sections->swift5_protocol_conformances;
   const void *conformances =
       reinterpret_cast<void *>(protocol_conformances.start);
   if (protocol_conformances.length)
     addImageProtocolConformanceBlockCallback(conformances,
                                              protocol_conformances.length);
 
-  const auto &type_metadata = sections->swift4_type_metadata;
+  const auto &type_metadata = sections->swift5_type_metadata;
   const void *metadata = reinterpret_cast<void *>(type_metadata.start);
   if (type_metadata.length)
     addImageTypeMetadataRecordBlockCallback(metadata, type_metadata.length);
diff --git a/stdlib/public/runtime/ImageInspectionCOFF.h b/stdlib/public/runtime/ImageInspectionCOFF.h
@@ -45,13 +45,13 @@ struct MetadataSections {
     size_t length;
   };
 
-  Range swift4_protocols;
-  Range swift4_protocol_conformances;
-  Range swift4_type_metadata;
-  Range swift4_typeref;
-  Range swift4_reflstr;
-  Range swift4_fieldmd;
-  Range swift4_assocty;
+  Range swift5_protocols;
+  Range swift5_protocol_conformances;
+  Range swift5_type_metadata;
+  Range swift5_typeref;
+  Range swift5_reflstr;
+  Range swift5_fieldmd;
+  Range swift5_assocty;
 };
 } // namespace swift
 
diff --git a/stdlib/public/runtime/ImageInspectionELF.cpp b/stdlib/public/runtime/ImageInspectionELF.cpp
@@ -46,7 +46,7 @@ void swift::initializeProtocolLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &protocols =
-        sections->swift4_protocols;
+        sections->swift5_protocols;
     if (protocols.length)
       addImageProtocolsBlockCallback(reinterpret_cast<void *>(protocols.start),
                                      protocols.length);
@@ -60,7 +60,7 @@ void swift::initializeProtocolConformanceLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &conformances =
-        sections->swift4_protocol_conformances;
+        sections->swift5_protocol_conformances;
     if (conformances.length)
       addImageProtocolConformanceBlockCallback(reinterpret_cast<void *>(conformances.start),
                                                conformances.length);
@@ -75,7 +75,7 @@ void swift::initializeTypeMetadataRecordLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
     const swift::MetadataSections::Range &type_metadata =
-        sections->swift4_type_metadata;
+        sections->swift5_type_metadata;
     if (type_metadata.length)
       addImageTypeMetadataRecordBlockCallback(reinterpret_cast<void *>(type_metadata.start),
                                               type_metadata.length);
@@ -89,7 +89,7 @@ void swift::initializeTypeMetadataRecordLookup() {
 void swift::initializeTypeFieldLookup() {
   const swift::MetadataSections *sections = registered;
   while (true) {
-    const swift::MetadataSections::Range &fields = sections->swift4_fieldmd;
+    const swift::MetadataSections::Range &fields = sections->swift5_fieldmd;
     if (fields.length)
       addImageTypeFieldDescriptorBlockCallback(
           reinterpret_cast<void *>(fields.start), fields.length);
@@ -111,20 +111,20 @@ void swift_addNewDSOImage(const void *addr) {
 
   record(sections);
 
-  const auto &protocols_section = sections->swift4_protocols;
+  const auto &protocols_section = sections->swift5_protocols;
   const void *protocols =
       reinterpret_cast<void *>(protocols_section.start);
   if (protocols_section.length)
     addImageProtocolsBlockCallback(protocols, protocols_section.length);
 
-  const auto &protocol_conformances = sections->swift4_protocol_conformances;
+  const auto &protocol_conformances = sections->swift5_protocol_conformances;
   const void *conformances =
       reinterpret_cast<void *>(protocol_conformances.start);
   if (protocol_conformances.length)
     addImageProtocolConformanceBlockCallback(conformances,
                                              protocol_conformances.length);
 
-  const auto &type_metadata = sections->swift4_type_metadata;
+  const auto &type_metadata = sections->swift5_type_metadata;
   const void *metadata = reinterpret_cast<void *>(type_metadata.start);
   if (type_metadata.length)
     addImageTypeMetadataRecordBlockCallback(metadata, type_metadata.length);
diff --git a/stdlib/public/runtime/ImageInspectionELF.h b/stdlib/public/runtime/ImageInspectionELF.h
@@ -45,13 +45,13 @@ struct MetadataSections {
     size_t length;
   };
 
-  Range swift4_protocols;
-  Range swift4_protocol_conformances;
-  Range swift4_type_metadata;
-  Range swift4_typeref;
-  Range swift4_reflstr;
-  Range swift4_fieldmd;
-  Range swift4_assocty;
+  Range swift5_protocols;
+  Range swift5_protocol_conformances;
+  Range swift5_type_metadata;
+  Range swift5_typeref;
+  Range swift5_reflstr;
+  Range swift5_fieldmd;
+  Range swift5_assocty;
 };
 } // namespace swift
 
diff --git a/stdlib/public/runtime/ImageInspectionMachO.cpp b/stdlib/public/runtime/ImageInspectionMachO.cpp
@@ -31,16 +31,16 @@ using namespace swift;
 namespace {
 /// The Mach-O section name for the section containing protocol descriptor
 /// references. This lives within SEG_TEXT.
-constexpr const char ProtocolsSection[] = "__swift4_protos";
+constexpr const char ProtocolsSection[] = "__swift5_protos";
 /// The Mach-O section name for the section containing protocol conformances.
 /// This lives within SEG_TEXT.
-constexpr const char ProtocolConformancesSection[] = "__swift4_proto";
+constexpr const char ProtocolConformancesSection[] = "__swift5_proto";
 /// The Mach-O section name for the section containing type references.
 /// This lives within SEG_TEXT.
-constexpr const char TypeMetadataRecordSection[] = "__swift4_types";
+constexpr const char TypeMetadataRecordSection[] = "__swift5_types";
 /// The Mach-O section name for the section containing type field references.
 /// This lives within SEG_TEXT.
-constexpr const char TypeFieldRecordSection[] = "__swift4_fieldmd";
+constexpr const char TypeFieldRecordSection[] = "__swift5_fieldmd";
 
 #if __POINTER_WIDTH__ == 64
 using mach_header_platform = mach_header_64;
@@ -57,7 +57,7 @@ void addImageCallback(const mach_header *mh, intptr_t vmaddr_slide) {
   assert(mh->magic == MH_MAGIC_64 && "loaded non-64-bit image?!");
 #endif
   
-  // Look for a __swift4_proto section.
+  // Look for a __swift5_proto section.
   unsigned long size;
   const uint8_t *section =
   getsectiondata(reinterpret_cast<const mach_header_platform *>(mh),
diff --git a/stdlib/public/runtime/SwiftRT-ELF.cpp b/stdlib/public/runtime/SwiftRT-ELF.cpp
@@ -24,14 +24,14 @@
   __attribute__((__visibility__("hidden"))) extern const char __stop_##name;
 
 extern "C" {
-DECLARE_SWIFT_SECTION(swift4_protocols)
-DECLARE_SWIFT_SECTION(swift4_protocol_conformances)
-DECLARE_SWIFT_SECTION(swift4_type_metadata)
-
-DECLARE_SWIFT_SECTION(swift4_typeref)
-DECLARE_SWIFT_SECTION(swift4_reflstr)
-DECLARE_SWIFT_SECTION(swift4_fieldmd)
-DECLARE_SWIFT_SECTION(swift4_assocty)
+DECLARE_SWIFT_SECTION(swift5_protocols)
+DECLARE_SWIFT_SECTION(swift5_protocol_conformances)
+DECLARE_SWIFT_SECTION(swift5_type_metadata)
+
+DECLARE_SWIFT_SECTION(swift5_typeref)
+DECLARE_SWIFT_SECTION(swift5_reflstr)
+DECLARE_SWIFT_SECTION(swift5_fieldmd)
+DECLARE_SWIFT_SECTION(swift5_assocty)
 }
 
 #undef DECLARE_SWIFT_SECTION
@@ -53,14 +53,14 @@ static void swift_image_constructor() {
       nullptr,
       nullptr,
 
-      SWIFT_SECTION_RANGE(swift4_protocols),
-      SWIFT_SECTION_RANGE(swift4_protocol_conformances),
-      SWIFT_SECTION_RANGE(swift4_type_metadata),
+      SWIFT_SECTION_RANGE(swift5_protocols),
+      SWIFT_SECTION_RANGE(swift5_protocol_conformances),
+      SWIFT_SECTION_RANGE(swift5_type_metadata),
 
-      SWIFT_SECTION_RANGE(swift4_typeref),
-      SWIFT_SECTION_RANGE(swift4_reflstr),
-      SWIFT_SECTION_RANGE(swift4_fieldmd),
-      SWIFT_SECTION_RANGE(swift4_assocty),
+      SWIFT_SECTION_RANGE(swift5_typeref),
+      SWIFT_SECTION_RANGE(swift5_reflstr),
+      SWIFT_SECTION_RANGE(swift5_fieldmd),
+      SWIFT_SECTION_RANGE(swift5_assocty),
   };
 
 #undef SWIFT_SECTION_RANGE
diff --git a/test/IRGen/closure.swift b/test/IRGen/closure.swift
@@ -4,7 +4,7 @@
 
 // -- partial_apply context metadata
 
-// CHECK: [[METADATA:@.*]] = private constant %swift.full_boxmetadata { void (%swift.refcounted*)* @objectdestroy, i8** null, %swift.type { i64 64 }, i32 16, i8* bitcast ({ i32, i32, i32, i32 }* @"\01l__swift4_reflection_descriptor" to i8*) }
+// CHECK: [[METADATA:@.*]] = private constant %swift.full_boxmetadata { void (%swift.refcounted*)* @objectdestroy, i8** null, %swift.type { i64 64 }, i32 16, i8* bitcast ({ i32, i32, i32, i32 }* @"\01l__swift5_reflection_descriptor" to i8*) }
 
 func a(i i: Int) -> (Int) -> Int {
   return { x in i }
diff --git a/test/IRGen/reflection_metadata.swift b/test/IRGen/reflection_metadata.swift
diff --git a/test/IRGen/reflection_metadata_imported.swift b/test/IRGen/reflection_metadata_imported.swift
diff --git a/test/IRGen/swift3-metadata-coff.swift b/test/IRGen/swift3-metadata-coff.swift
diff --git a/tools/swift-reflection-dump/swift-reflection-dump.cpp b/tools/swift-reflection-dump/swift-reflection-dump.cpp
diff --git a/utils/cmpcodesize/cmpcodesize/compare.py b/utils/cmpcodesize/cmpcodesize/compare.py
