[Clang importer] Enable API notes alongside header/frameworks.

Enable newly-introduced Clang functionality to load API notes stored
alongside the headers for a module or, for a framework, in an APINotes
subdirectory within the framework. Fixes rdar://problem/28455644.

Author: DougGregor

lib/ClangImporter/ClangImporter.cpp

@@ -474,10 +474,13 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
 
   const std::string &moduleCachePath = importerOpts.ModuleCachePath;
 
-  // Set the module cache path.
+  // Set the module and API notes cache paths to the same location.
   if (!moduleCachePath.empty()) {
     invocationArgStrs.push_back("-fmodules-cache-path=");
     invocationArgStrs.back().append(moduleCachePath);
+
+    invocationArgStrs.push_back("-fapinotes-cache-path=");
+    invocationArgStrs.back().append(moduleCachePath);
   }
 
   if (importerOpts.DetailedPreprocessingRecord) {
@@ -562,6 +565,9 @@ addCommonInvocationArguments(std::vector<std::string> &invocationArgStrs,
     invocationArgStrs.push_back(extraArg);
   }
 
+  // Enable API notes alongside headers/in frameworks.
+  invocationArgStrs.push_back("-fapinotes-modules");
+
   // Add API notes paths.
   for (const auto &searchPath : searchPathOpts.ImportSearchPaths) {
     invocationArgStrs.push_back("-iapinotes-modules");

test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/APINotes/APINotesFrameworkTest.apinotes

@@ -0,0 +1,4 @@
+Name: APINotesFrameworkTest
+Functions:
+  - Name: jumpToLocation
+    SwiftName: 'jumpTo(x:y:z:)'

test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/APINotesFrameworkTest.h

@@ -0,0 +1 @@
+void jumpToLocation(int, int, int);

test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Modules/module.modulemap

@@ -0,0 +1,4 @@
+framework module APINotesFrameworkTest {
+  umbrella header "APINotesFrameworkTest.h"
+  export *
+}

test/APINotes/basic.swift

@@ -1,5 +1,6 @@
-// RUN: %target-parse-verify-swift -I %S/Inputs/custom-modules
+// RUN: %target-parse-verify-swift -I %S/Inputs/custom-modules -F %S/Inputs/custom-frameworks
 import APINotesTest
+import APINotesFrameworkTest
 
 func testSwiftName() {
   moveTo(x: 0, y: 0, z: 0)
@@ -17,4 +18,8 @@ func testSwiftName() {
   let rect2: RectStruct // expected-error{{'RectStruct' has been renamed to 'Rect'}}
 
   let d: Double = __will_be_private
+
+  // From APINotesFrameworkTest.
+  jumpTo(x: 0, y: 0, z: 0)
+  jumpTo(0, 0, 0) // expected-error{{missing argument labels 'x:y:z:' in call}}
 }

tools/driver/api_notes.cpp

@@ -123,7 +123,7 @@ int apinotes_main(ArrayRef<const char *> Args) {
     llvm::raw_fd_ostream os(OutputFilename, EC,
                             llvm::sys::fs::OpenFlags::F_None);
 
-    if (api_notes::compileAPINotes(input, os, targetOS))
+    if (api_notes::compileAPINotes(input, /*sourceFile=*/nullptr, os, targetOS))
       return 1;
 
     os.flush();