From 7fa450c6aeeac0e7639092e99d909cae3f07bcb6 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 1 Sep 2015 01:37:34 +0000 Subject: [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 --- clang/test/Modules/merge-using-decls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/test/Modules/merge-using-decls.cpp') 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(); // 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. -- cgit v1.2.3