Add base file support for assert config

Author: Azoy

test/abi/macOS/arm64/stdlib-asserts.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %llvm-nm -g --defined-only -f just-symbols %stdlib_dir/arm64/libswiftCore.dylib > %t/symbols
-// RUN: %abi-symbol-checker %s %t/symbols
+// RUN: %abi-symbol-checker %s %t/symbols --base %S/stdlib.swift
 // RUN: diff -u %S/../../Inputs/macOS/arm64/stdlib/baseline-asserts %t/symbols
 
 // REQUIRES: swift_stdlib_asserts
@@ -34,15 +34,10 @@
 // Thank you for your help ensuring the stdlib remains compatible with its past!
 //                                            -- Your friendly stdlib engineers
 
-// Standard Library Symbols
-
-// Swift._getRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss15_getRetainCountySuyXlF
+// *** NOTE: ***
+// You will normally add new entries in 'abi/macOS/arm64/stdlib.swift' instead
+// of this file. This file is dedicated for assert only symbols.
 
-// Swift._getWeakRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss19_getWeakRetainCountySuyXlF
-
-// Swift._getUnownedRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss22_getUnownedRetainCountySuyXlF
+// Standard Library Symbols
 
 // Runtime Symbols

test/abi/macOS/arm64/stdlib.swift

@@ -45,4 +45,10 @@ Added: _$ss19_getWeakRetainCountySuyXlF
 // Swift._getUnownedRetainCount(Swift.AnyObject) -> Swift.UInt
 Added: _$ss22_getUnownedRetainCountySuyXlF
 
+// Swift.hello() -> ()
+Added: _$ss5helloyyF
+
+// static Swift.Unicode.UTF16._isASCII(Swift.UInt16) -> Swift.Bool
+Removed: _$ss7UnicodeO5UTF16O8_isASCIIySbs6UInt16VFZ
+
 // Runtime Symbols

test/abi/macOS/x86_64/stdlib-asserts.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %llvm-nm -g --defined-only -f just-symbols %stdlib_dir/x86_64/libswiftCore.dylib > %t/symbols
-// RUN: %abi-symbol-checker %s %t/symbols
+// RUN: %abi-symbol-checker %s %t/symbols --base %S/stdlib.swift
 // RUN: diff -u %S/../../Inputs/macOS/x86_64/stdlib/baseline-asserts %t/symbols
 
 // REQUIRES: swift_stdlib_asserts
@@ -34,15 +34,10 @@
 // Thank you for your help ensuring the stdlib remains compatible with its past!
 //                                            -- Your friendly stdlib engineers
 
-// Standard Library Symbols
-
-// Swift._getRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss15_getRetainCountySuyXlF
+// *** NOTE: ***
+// You will normally add new entries in 'abi/macOS/x86_64/stdlib.swift' instead
+// of this file. This file is dedicated for assert only symbols.
 
-// Swift._getWeakRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss19_getWeakRetainCountySuyXlF
-
-// Swift._getUnownedRetainCount(Swift.AnyObject) -> Swift.UInt
-Added: _$ss22_getUnownedRetainCountySuyXlF
+// Standard Library Symbols
 
 // Runtime Symbols

test/abi/macOS/x86_64/stdlib.swift

@@ -45,4 +45,10 @@ Added: _$ss19_getWeakRetainCountySuyXlF
 // Swift._getUnownedRetainCount(Swift.AnyObject) -> Swift.UInt
 Added: _$ss22_getUnownedRetainCountySuyXlF
 
+// Swift.hello() -> ()
+Added: _$ss5helloyyF
+
+// static Swift.Unicode.UTF16._isASCII(Swift.UInt16) -> Swift.Bool
+Removed: _$ss7UnicodeO5UTF16O8_isASCIIySbs6UInt16VFZ
+
 // Runtime Symbols

utils/swift-abi-symbol-checker.py

@@ -4,14 +4,9 @@
 import sys
 
 
-def checkSymbols(changesFile, symbolsFile):
+def getAdditionsAndRemovals(changesFile):
     changesF = open(changesFile)
-    # We need to write back to the temporary symbol file for diffing
-    symbolsF = open(symbolsFile, 'r+')
-
     changes = changesF.read()
-    symbols = symbolsF.read().splitlines()
-
     changesF.close()
 
     # Get rid of lines that start with either '//' or a newline
@@ -27,6 +22,29 @@ def checkSymbols(changesFile, symbolsFile):
     # Map the removals by removing the 'Removed: ' prefix to get just the symbol
     removals = list(map(lambda r: r.removeprefix('Removed: '), removals))
 
+    return (additions, removals)
+
+
+def checkSymbols(args):
+    # If we were passed a base file, read those changes first. This most likely
+    # occurs in assert configurations getting the non-assert base.
+    baseAdditions = []
+    baseRemovals = []
+
+    if args.base:
+        (baseAdditions, baseRemovals) = getAdditionsAndRemovals(args.base)
+
+    (additions, removals) = getAdditionsAndRemovals(args.changes)
+
+    # Append the base additions and removals to ours.
+    additions.extend(baseAdditions)
+    removals.extend(baseRemovals)
+
+    # We need to write back to the temporary symbol file for diffing
+    symbolsF = open(args.symbols, 'r+')
+
+    symbols = symbolsF.read().splitlines()
+
     # Check for added symbols that are not actually in the just built dylib.
     notInDylib = [a for a in additions if a not in symbols]
 
@@ -69,10 +87,11 @@ def main(arguments):
 
     parser.add_argument('changes', help='the changes file')
     parser.add_argument('symbols', help='the symbols file')
+    parser.add_argument('--base',  help='the base changes file')
 
     args = parser.parse_args(arguments)
 
-    checkSymbols(args.changes, args.symbols)
+    checkSymbols(args)
 
 
 sys.exit(main(sys.argv[1:]))