summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/Inputs/merge-nested-templates/a.h
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-01-24 01:07:20 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-01-24 01:07:20 +0000
commit8a63989728b67584e64800e1f4c586f8c0acbfa7 (patch)
treebbff117d868c80a4ba00d6ecf8ede1ade84e6cba /clang/test/Modules/Inputs/merge-nested-templates/a.h
parentad363ad8042f44e8006554a6447fc46807d1a9ed (diff)
downloadbcm5719-llvm-8a63989728b67584e64800e1f4c586f8c0acbfa7.tar.gz
bcm5719-llvm-8a63989728b67584e64800e1f4c586f8c0acbfa7.zip
[modules] Sometimes we can deserialize a class member but not have yet
encountered any definition for the class; this happens when the definition is added by an update record that is not yet loaded. In such a case, eagerly pick the original parent of the member as the canonical definition of the class rather than muddling through with the canonical declaration (the latter can lead to us failing to merge properly later if the canonical definition turns out to be some other declaration). llvm-svn: 226977
Diffstat (limited to 'clang/test/Modules/Inputs/merge-nested-templates/a.h')
-rw-r--r--clang/test/Modules/Inputs/merge-nested-templates/a.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/merge-nested-templates/a.h b/clang/test/Modules/Inputs/merge-nested-templates/a.h
new file mode 100644
index 00000000000..826d2571fd1
--- /dev/null
+++ b/clang/test/Modules/Inputs/merge-nested-templates/a.h
@@ -0,0 +1 @@
+#include "string.ii"
OpenPOWER on IntegriCloud