summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/Inputs
diff options
context:
space:
mode:
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>2017-03-17 22:55:13 +0000
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>2017-03-17 22:55:13 +0000
commit079c40e8860ccbc80b5a04a26e474b2923d92d48 (patch)
treeadc13f151cb13cd30bce6a5fed9c035dfa4e8179 /clang/test/Modules/Inputs
parent77e6ebe748e5a36dd12d44d31c3987ca56af2d43 (diff)
downloadbcm5719-llvm-079c40e8860ccbc80b5a04a26e474b2923d92d48.tar.gz
bcm5719-llvm-079c40e8860ccbc80b5a04a26e474b2923d92d48.zip
Modules: Cache PCMs in memory and avoid a use-after-free
Clang's internal build system for implicit modules uses lock files to ensure that after a process writes a PCM it will read the same one back in (without contention from other -cc1 commands). Since PCMs are read from disk repeatedly while invalidating, building, and importing, the lock is not released quickly. Furthermore, the LockFileManager is not robust in every environment. Other -cc1 commands can stall until timeout (after about eight minutes). This commit changes the lock file from being necessary for correctness to a (possibly dubious) performance hack. The remaining benefit is to reduce duplicate work in competing -cc1 commands which depend on the same module. Follow-up commits will change the internal build system to continue after a timeout, and reduce the timeout. Perhaps we should reconsider blocking at all. This also fixes a use-after-free, when one part of a compilation validates a PCM and starts using it, and another tries to swap out the PCM for something new. The PCMCache is a new type called MemoryBufferCache, which saves memory buffers based on their filename. Its ownership is shared by the CompilerInstance and ModuleManager. - The ModuleManager stores PCMs there that it loads from disk, never touching the disk if the cache is hot. - When modules fail to validate, they're removed from the cache. - When a CompilerInstance is spawned to build a new module, each already-loaded PCM is assumed to be valid, and is frozen to avoid the use-after-free. - Any newly-built module is written directly to the cache to avoid the round-trip to the filesystem, making lock files unnecessary for correctness. Original patch by Manman Ren; most testcases by Adrian Prantl! llvm-svn: 298165
Diffstat (limited to 'clang/test/Modules/Inputs')
-rw-r--r--clang/test/Modules/Inputs/system-out-of-date/X.h1
-rw-r--r--clang/test/Modules/Inputs/system-out-of-date/Y.h1
-rw-r--r--clang/test/Modules/Inputs/system-out-of-date/Z.h1
-rw-r--r--clang/test/Modules/Inputs/system-out-of-date/module.map12
-rw-r--r--clang/test/Modules/Inputs/warning-mismatch/Mismatch.h1
-rw-r--r--clang/test/Modules/Inputs/warning-mismatch/System.h2
-rw-r--r--clang/test/Modules/Inputs/warning-mismatch/module.modulemap7
7 files changed, 25 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/system-out-of-date/X.h b/clang/test/Modules/Inputs/system-out-of-date/X.h
new file mode 100644
index 00000000000..edcfa18f5af
--- /dev/null
+++ b/clang/test/Modules/Inputs/system-out-of-date/X.h
@@ -0,0 +1 @@
+#import <Y.h>
diff --git a/clang/test/Modules/Inputs/system-out-of-date/Y.h b/clang/test/Modules/Inputs/system-out-of-date/Y.h
new file mode 100644
index 00000000000..90fe1bcc585
--- /dev/null
+++ b/clang/test/Modules/Inputs/system-out-of-date/Y.h
@@ -0,0 +1 @@
+//empty
diff --git a/clang/test/Modules/Inputs/system-out-of-date/Z.h b/clang/test/Modules/Inputs/system-out-of-date/Z.h
new file mode 100644
index 00000000000..edcfa18f5af
--- /dev/null
+++ b/clang/test/Modules/Inputs/system-out-of-date/Z.h
@@ -0,0 +1 @@
+#import <Y.h>
diff --git a/clang/test/Modules/Inputs/system-out-of-date/module.map b/clang/test/Modules/Inputs/system-out-of-date/module.map
new file mode 100644
index 00000000000..0c0f42a5d01
--- /dev/null
+++ b/clang/test/Modules/Inputs/system-out-of-date/module.map
@@ -0,0 +1,12 @@
+module X [system] {
+ header "X.h" // imports Y
+ export *
+}
+module Y {
+ header "Y.h"
+ export *
+}
+module Z {
+ header "Z.h" // imports Y
+ export *
+}
diff --git a/clang/test/Modules/Inputs/warning-mismatch/Mismatch.h b/clang/test/Modules/Inputs/warning-mismatch/Mismatch.h
new file mode 100644
index 00000000000..a07b0ee31ea
--- /dev/null
+++ b/clang/test/Modules/Inputs/warning-mismatch/Mismatch.h
@@ -0,0 +1 @@
+struct Mismatch { int i; };
diff --git a/clang/test/Modules/Inputs/warning-mismatch/System.h b/clang/test/Modules/Inputs/warning-mismatch/System.h
new file mode 100644
index 00000000000..8e69e704c75
--- /dev/null
+++ b/clang/test/Modules/Inputs/warning-mismatch/System.h
@@ -0,0 +1,2 @@
+#import "Mismatch.h"
+struct System { int i; };
diff --git a/clang/test/Modules/Inputs/warning-mismatch/module.modulemap b/clang/test/Modules/Inputs/warning-mismatch/module.modulemap
new file mode 100644
index 00000000000..c22cde45978
--- /dev/null
+++ b/clang/test/Modules/Inputs/warning-mismatch/module.modulemap
@@ -0,0 +1,7 @@
+module System [system] {
+ header "System.h"
+}
+
+module Mismatch {
+ header "Mismatch.h"
+}
OpenPOWER on IntegriCloud