[modules] Fix issue where building a module from a relative path when -working-directory option is set, results in error.

The error was "module '<name>' was built in directory '<path>' but now resides in directory '<path>'
rdar://21330027

llvm-svn: 243718

3 files changed, 16 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
new file mode 100644
index 00000000000..ecc54bfc725
--- /dev/null
+++ b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
@@ -0,0 +1 @@
+void test_me_call(void);
diff --git a/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
new file mode 100644
index 00000000000..3040ac722f9
--- /dev/null
+++ b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module Test {
+  umbrella header "Test.h"
+
+  export *
+  module * { export * }
+}
diff --git a/clang/test/Modules/working-dir-flag.m b/clang/test/Modules/working-dir-flag.m
new file mode 100644
index 00000000000..0e258c0d2fe
--- /dev/null
+++ b/clang/test/Modules/working-dir-flag.m
@@ -0,0 +1,9 @@
+// RUN: rm -rf %t.mcp
+// RUN: %clang_cc1 -fmodules-cache-path=%t.mcp -fmodules -fimplicit-module-maps -F . -working-directory=%S/Inputs/working-dir-test %s -verify
+// expected-no-diagnostics
+
+@import Test;
+
+void foo() {
+  test_me_call();
+}