Swap swift-demangle and swift-demangle-yamldump substitutions order

Author: scentini

test/lit.cfg

@@ -282,8 +282,8 @@ config.sourcekitd_test = inferSwiftBinary('sourcekitd-test')
 config.complete_test = inferSwiftBinary('complete-test')
 config.swift_api_digester = inferSwiftBinary('swift-api-digester')
 config.swift_refactor = inferSwiftBinary('swift-refactor')
-config.swift_demangle = inferSwiftBinary('swift-demangle')
 config.swift_demangle_yamldump = inferSwiftBinary('swift-demangle-yamldump')
+config.swift_demangle = inferSwiftBinary('swift-demangle')
 config.benchmark_o = inferSwiftBinary('Benchmark_O')
 config.benchmark_driver = inferSwiftBinary('Benchmark_Driver')
 config.wasmer = inferSwiftBinary('wasmer')
@@ -440,8 +440,8 @@ config.substitutions.append( ('%llvm-dwarfdump', config.llvm_dwarfdump) )
 config.substitutions.append( ('%llvm-readelf', config.llvm_readelf) )
 config.substitutions.append( ('%llvm-dis', config.llvm_dis) )
 config.substitutions.append( ('%llvm-nm', config.llvm_nm) )
-config.substitutions.append( ('%swift-demangle', config.swift_demangle) )
 config.substitutions.append( ('%swift-demangle-yamldump', config.swift_demangle_yamldump) )
+config.substitutions.append( ('%swift-demangle', config.swift_demangle) )
 config.substitutions.append( ('%Benchmark_O', config.benchmark_o) )
 config.substitutions.append( ('%Benchmark_Driver', config.benchmark_driver) )
 config.substitutions.append( ('%llvm-strings', config.llvm_strings) )
@@ -2038,4 +2038,3 @@ else:
     num_extra_inhabitants_64bit = 4096
 add_num_extra_inhabitants = "-D#num_extra_inhabitants_64bit={} ".format(num_extra_inhabitants_64bit)
 config.substitutions.append(('%add_num_extra_inhabitants', add_num_extra_inhabitants))
-