Hi Francis, That PR is on the 4.1 branch. I can’t merge it either. The failure below is on master though.
-Andy > On Jan 2, 2018, at 3:08 AM, Francis Visoiu Mistrih <franci...@yahoo.com> > wrote: > > Hi Andy, > > I have a pull request ready: https://github.com/apple/swift/pull/13668 > <https://github.com/apple/swift/pull/13668> > > Can you please merge it? The branch is locked for me so I can’t commit to it. > > Cheers, > > — > Francis > > >> On 2 Jan 2018, at 11:05, Andrew Trick <atr...@apple.com >> <mailto:atr...@apple.com>> wrote: >> >> /Users/buildnode/jenkins/workspace/oss-swift_tools-RA_stdlib-RDA_test-macos-resilience/swift/tools/swift-ide-test/ModuleAPIDiff.cpp:243:1: >> error: cannot initialize return object of type 'bool' with an rvalue of >> type 'llvm::yaml::QuotingType' >> >> Francis, >> Maybe another test needs to be updated? >> -Andy >> >>> On Jan 2, 2018, at 2:57 AM, swift...@swift.org <mailto:swift...@swift.org> >>> wrote: >>> >>> [FAILURE] oss-swift_tools-RA_stdlib-RDA_test-macos-resilience [#156] >>> >>> Build URL: >>> https://ci.swift.org/job/oss-swift_tools-RA_stdlib-RDA_test-macos-resilience/156/ >>> >>> <https://ci.swift.org/job/oss-swift_tools-RA_stdlib-RDA_test-macos-resilience/156/> >>> Project: oss-swift_tools-RA_stdlib-RDA_test-macos-resilience >>> Date of build: Tue, 02 Jan 2018 03:47:00 -0600 >>> Build duration: 1 hr 10 min >>> Identified problems: >>> >>> Compile Error: This build failed because of a compile error. Below is a >>> list of all errors in the build log: >>> Indication 1 >>> <https://ci.swift.org//job/oss-swift_tools-RA_stdlib-RDA_test-macos-resilience/156/consoleFull#-19777730693122a513-f36a-4c87-8ed7-cbc36a1ec144> >>> Changes >>> >>> Commit 1e631089985d2c814605c50b3630460014a76c32 by clattner: >>> Speculative fix for a regression on the >>> >>> edit: lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp >>> >>> Commit 3761ee3f1b467a55947ba109c4921013e4d86b66 by clattner: >>> Remove a transformation introduced in PR13652 which fails on the iOS >>> >>> edit: lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp >>> edit: lib/SILOptimizer/SILCombiner/SILCombiner.h >>> edit: test/SILOptimizer/sil_combine.sil >>> >>> Commit 47328a5054e29adb12fde4befb50e6880e388c3a by dave: >>> [AST] Perf: Avoid reg spills on the fast path of getCanonicalType() >>> >>> edit: include/swift/AST/Types.h >>> edit: lib/AST/Type.cpp >>> >>> Commit 17fa484f043c8735bafe12a72c9fece55e43c652 by atrick: >>> SILGen. Fix temporary LValue cleanup. >>> >>> edit: lib/SILGen/SILGenLValue.cpp >>> edit: test/SILGen/protocol_class_refinement.swift >>> edit: test/SILGen/objc_ownership_conventions.swift >>> edit: test/SILGen/protocol_extensions.swift >>> edit: test/SILGen/properties.swift >>> edit: test/SILGen/class_bound_protocols.swift >>> edit: lib/SILGen/SILGenApply.cpp >>> edit: test/SILGen/protocols.swift >>> edit: test/SILGen/borrow.swift >>> >>> Commit e03fceb91ec65277e473a3d37c9b05e39fc50d72 by francisvm: >>> [MC] - Don't assert when non-english characters are used. >>> >>> add: test/MC/AsmParser/non-english-characters.s >>> edit: lib/MC/MCParser/AsmLexer.cpp >>> edit: include/llvm/ADT/StringExtras.h >>> >>> Commit b80670d77d3f4cde54f6d33d9e8ced48e72acdbf by francisvm: >>> [YAML] Add support for non-printable characters >>> >>> edit: lib/ObjectYAML/MachOYAML.cpp >>> edit: lib/Support/YAMLTraits.cpp >>> edit: include/llvm/ObjectYAML/YAML.h >>> edit: lib/Support/Statistic.cpp >>> edit: tools/dsymutil/DebugMap.h >>> edit: lib/Support/Timer.cpp >>> add: test/CodeGen/MIR/X86/escape-function-name.ll >>> edit: docs/YamlIO.rst >>> edit: lib/ObjectYAML/CodeViewYAMLTypes.cpp >>> edit: include/llvm/ObjectYAML/CodeViewYAMLTypes.h >>> edit: lib/ObjectYAML/CodeViewYAMLDebugSections.cpp >>> edit: include/llvm/Support/YAMLTraits.h >>> edit: include/llvm/CodeGen/MIRYamlMapping.h >>> edit: lib/ObjectYAML/CodeViewYAMLSymbols.cpp >>> edit: include/llvm/ObjectYAML/MachOYAML.h >>> edit: unittests/Support/YAMLIOTest.cpp >>> >>> Commit acf228aeceb201e00598b4e3bdc164363a3eea48 by francisvm: >>> [YAML] Fix UTF-8 handling >>> >>> edit: lib/Support/YAMLTraits.cpp >>> edit: unittests/Support/YAMLIOTest.cpp >>> >>> Commit 59f955a93ed5cbcec7c415a63e0d7bd7244762d4 by francisvm: >>> [YAML] Refactor escaping unittests >>> >>> edit: unittests/Support/YAMLIOTest.cpp >>> edit: include/llvm/Support/YAMLTraits.h >>> >>> Commit 93f37e53dca07fa398a0ab39cab87fb140edd0f3 by francisvm: >>> [YAML] Fix YAML API usage >>> >>> edit: lib/APINotes/APINotesYAMLCompiler.cpp >> >
_______________________________________________ swift-dev mailing list swift-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-dev