3 Commits

Author	SHA1	Message	Date
Richard Smith	4eca9b9372	[modules] When using -E, we may try to merge decls despite having no Sema ... object. In such a case, use the TU's DC for merging global decls rather than giving up when we find there is no TU scope. Ultimately, we should probably avoid all loading of decls when preprocessing, but there are other reasonable use cases for loading an AST file with no Sema object for which this is the right thing. llvm-svn: 228234	2015-02-04 23:37:59 +00:00
Ben Langmuir	4a78c9eec4	Remove a couple of fixed paths that snuck into my test from 217550 ... I forgot to fix these again the second time I copy-and-pasted. llvm-svn: 217552	2014-09-10 21:41:43 +00:00
Ben Langmuir	5418f40127	Avoid a couple of assertions when preprocessing with modules ... 1. We were hitting the NextIsPrevious assertion because we were trying to merge decl chains that were independent of each other because we had no Sema object to allow them to find existing decls. This is fixed by delaying loading the "preloaded" decls until Sema is available. 2. We were trying to get identifier info from an annotation token, which asserts. The fix is to special-case the module annotations in the preprocessed output printer. Fixed in a single commit because when you hit 1 you almost invariably hit 2 as well. llvm-svn: 217550	2014-09-10 21:29:41 +00:00