Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift_jenkins
2019-12-19 11:19:56 -08:00
13 changed files with 1395 additions and 847 deletions

View File

@@ -1951,6 +1951,10 @@ static void printTargetInfo(CompilerInvocation &invocation,
out.write_escaped(langOpts.Target.getTriple());
out << "\",\n";
out << " \"unversionedTriple\": \"";
out.write_escaped(getUnversionedTriple(langOpts.Target).getTriple());
out << "\",\n";
out << " \"moduleTriple\": \"";
out.write_escaped(getTargetSpecificModuleTriple(langOpts.Target).getTriple());
out << "\",\n";