averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
swift-ci
2018-03-13 12:09:54 -07:00
parent 6ae877bd8f 9746a284cd
commit e7610782ca
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/SourceKit/CursorInfo/ignore-llvm-args.swift Normal file
View File

@@ -0,0 +1,6 @@
_ = ""
// rdar://problem/38314383
// RUN: %sourcekitd-test -req=cursor -offset=0 %s -- -Xllvm -aarch64-use-tbi %s | %FileCheck %s
// CHECK: <empty cursor info>

2
tools/SourceKit/lib/Support/Logging.cpp
View File

@@ -63,7 +63,7 @@ Logger::~Logger() {
OS << llvm::format("%7.4f] ", TR.getWallTime() - sBeginTR.getWallTime()); OS << llvm::format("%7.4f] ", TR.getWallTime() - sBeginTR.getWallTime());
OS << Msg.str(); OS << Msg.str();
llvm::errs() << LoggerName << ": " << LogMsg.str() << '\n'; fprintf(stderr, "%s: %s", LoggerName.c_str(), LogMsg.c_str());
#if __APPLE__ #if __APPLE__
// Use the Apple System Log facility. // Use the Apple System Log facility.

3
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -459,6 +459,9 @@ bool SwiftASTManager::initCompilerInvocation(CompilerInvocation &Invocation,
// SwiftONoneSupport module. // SwiftONoneSupport module.
FrontendOpts.RequestedAction = FrontendOptions::ActionType::Typecheck; FrontendOpts.RequestedAction = FrontendOptions::ActionType::Typecheck;
// We don't care about LLVMArgs
FrontendOpts.LLVMArgs.clear();
return false; return false;
} }