---

yaml
---
r: 348651
b: refs/heads/master
c: 051159f
h: refs/heads/master
i:
  348649: 38b3118
  348647: 19e86b6

Author: beccadax

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 97febd42a9190367941d4e28884c1b0a9fa8ed59
+refs/heads/master: 051159f3b4e251d3cdf77c4209918911ec379565
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/IRGen/IRGenPublic.h

@@ -36,6 +36,9 @@ createIRGenModule(SILModule *SILMod, StringRef OutputFilename,
 /// Delete the IRGenModule and IRGenerator obtained by the above call.
 void deleteIRGenModule(std::pair<IRGenerator *, IRGenModule *> &Module);
 
+/// Gets the ABI version number that'll be set as a flag in the module.
+uint32_t getSwiftABIVersion();
+
 } // end namespace irgen
 } // end namespace swift
 

trunk/include/swift/TBDGen/TBDGen.h

@@ -24,9 +24,6 @@ namespace swift {
 class FileUnit;
 class ModuleDecl;
 
-/// The current ABI version of Swift, as tapi labels it.
-const uint8_t TAPI_SWIFT_ABI_VERSION = 5;
-
 /// Options for controlling the exact set of symbols included in the TBD
 /// output.
 struct TBDGenOptions {

trunk/lib/IRGen/IRGenModule.cpp

@@ -22,6 +22,7 @@
 #include "swift/Basic/Dwarf.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/ClangImporter/ClangImporter.h"
+#include "swift/IRGen/IRGenPublic.h"
 #include "swift/IRGen/Linking.h"
 #include "swift/Runtime/RuntimeFnWrappersGen.h"
 #include "swift/Runtime/Config.h"
@@ -1353,6 +1354,10 @@ IRGenModule *IRGenerator::getGenModule(SILFunction *f) {
   return getPrimaryIGM();
 }
 
+uint32_t swift::irgen::getSwiftABIVersion() {
+  return IRGenModule::swiftVersion;
+}
+
 llvm::Triple IRGenerator::getEffectiveClangTriple() {
   auto CI = static_cast<ClangImporter *>(
       &*SIL.getASTContext().getClangModuleLoader());

trunk/lib/TBDGen/TBDGen.cpp

@@ -22,6 +22,7 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/Basic/LLVM.h"
+#include "swift/IRGen/IRGenPublic.h"
 #include "swift/IRGen/Linking.h"
 #include "swift/SIL/FormalLinkage.h"
 #include "swift/SIL/SILDeclRef.h"
@@ -608,7 +609,7 @@ static void enumeratePublicSymbolsAndWrite(ModuleDecl *M, FileUnit *singleFile,
   file.setCurrentVersion(convertToPacked(opts.CurrentVersion));
   file.setCompatibilityVersion(convertToPacked(opts.CompatibilityVersion));
   file.setTwoLevelNamespace();
-  file.setSwiftABIVersion(TAPI_SWIFT_ABI_VERSION);
+  file.setSwiftABIVersion(irgen::getSwiftABIVersion());
   file.setInstallAPI(opts.IsInstallAPI);
 
   auto getPlatformKind =

trunk/test/TBD/abi-version.swift

@@ -0,0 +1,21 @@
+// RUN: %empty-directory(%t)
+
+// This test ensures that we see the same Swift ABI Version flag in the LLVM IR
+// and in the TBD.
+
+// 1. Emit IR and a TBD for this file
+
+// RUN: %target-swift-frontend -emit-ir -o %t/test.ll %s -emit-tbd-path %t/test.tbd
+
+// 2. Concatenate them and FileCheck them both in the same file, so we can capture
+//    the ABI version in a variable.
+
+// RUN: cat %t/test.ll %t/test.tbd | %FileCheck %s
+
+// 3. Look in the IR for the Swift Version flag
+
+// CHECK: !"Swift Version", i32 [[VERSION:[0-9]+]]
+
+// 4. Look in the TBD for the same version listed
+
+// CHECK: swift-abi-version: [[VERSION]]