Merge pull request #60107 from xymus/swiftmodule-tag-fix

[Serialization] Use a more reliable macro to get the compiler tag

Author: xymus

include/swift/Basic/Version.h

@@ -191,9 +191,12 @@ StringRef getSwiftRevision();
 
 /// Is the running compiler built with a version tag for distribution?
 /// When true, \c Version::getCurrentCompilerVersion returns a valid version
-/// and \c getSwiftRevision returns the version tuple in string format.
+/// and \c getCurrentCompilerTag returns the version tuple in string format.
 bool isCurrentCompilerTagged();
 
+/// Retrieves the distribtion tag of the running compiler, if any.
+StringRef getCurrentCompilerTag();
+
 } // end namespace version
 } // end namespace swift
 

lib/Basic/Version.cpp

@@ -507,5 +507,13 @@ bool isCurrentCompilerTagged() {
 #endif
 }
 
+StringRef getCurrentCompilerTag() {
+#ifdef SWIFT_COMPILER_VERSION
+  return SWIFT_COMPILER_VERSION;
+#else
+  return StringRef();
+#endif
+}
+
 } // end namespace version
 } // end namespace swift

lib/Serialization/ModuleFileSharedCore.cpp

@@ -359,7 +359,7 @@ static ValidationInfo validateControlBlock(
       StringRef moduleRevision = blobData;
       if (isCompilerTagged) {
         StringRef compilerRevision = forcedDebugRevision ?
-          forcedDebugRevision : version::getSwiftRevision();
+          forcedDebugRevision : version::getCurrentCompilerTag();
         if (moduleRevision != compilerRevision) {
           result.status = Status::RevisionIncompatible;
 

lib/Serialization/Serialization.cpp

@@ -1004,7 +1004,7 @@ void Serializer::writeHeader(const SerializationOptions &options) {
     static const char* forcedDebugRevision =
       ::getenv("SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION");
     auto revision = forcedDebugRevision ?
-      forcedDebugRevision : version::getSwiftRevision();
+      forcedDebugRevision : version::getCurrentCompilerTag();
     Revision.emit(ScratchRecord, revision);
 
     IsOSSA.emit(ScratchRecord, options.IsOSSA);