diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-09-01 01:37:34 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-09-01 01:37:34 +0000 |
| commit | 7fa450c6aeeac0e7639092e99d909cae3f07bcb6 (patch) | |
| tree | 4f1b9f3f1d0a284f06e28cc223a59c19348c3cc7 /clang/test/Modules/merge-using-decls.cpp | |
| parent | a8dde6c83f77d108da7556b8db975685572d6216 (diff) | |
| download | bcm5719-llvm-7fa450c6aeeac0e7639092e99d909cae3f07bcb6.tar.gz bcm5719-llvm-7fa450c6aeeac0e7639092e99d909cae3f07bcb6.zip | |
[modules] Preserve DeclID order when merging lookup tables to give a more
predictable diagnostic experience. The hash-of-DeclID order we were using
before gave different results on Win32 due to a different predefined
declaration of __builtin_va_list.
llvm-svn: 246521
Diffstat (limited to 'clang/test/Modules/merge-using-decls.cpp')
| -rw-r--r-- | clang/test/Modules/merge-using-decls.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp index 15d4af4837a..98989d12f98 100644 --- a/clang/test/Modules/merge-using-decls.cpp +++ b/clang/test/Modules/merge-using-decls.cpp @@ -33,7 +33,7 @@ template int UseAll<Y>(); // Which of these two sets of diagnostics is chosen is not important. It's OK // if this varies with ORDER, but it must be consistent across runs. -#if 1 +#if ORDER == 1 // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. |
