From 7fa450c6aeeac0e7639092e99d909cae3f07bcb6 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
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/cxx-templates.cpp     | 6 +++---
 clang/test/Modules/merge-using-decls.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'clang/test')

diff --git a/clang/test/Modules/cxx-templates.cpp b/clang/test/Modules/cxx-templates.cpp
index ea6f05d3318..fd6b4f5a2b1 100644
--- a/clang/test/Modules/cxx-templates.cpp
+++ b/clang/test/Modules/cxx-templates.cpp
@@ -28,15 +28,15 @@ void g() {
   f<double>(1.0);
   f<int>();
   f(); // expected-error {{no matching function}}
-  // expected-note@Inputs/cxx-templates-b.h:3 {{couldn't infer template argument}}
-  // expected-note-re@Inputs/cxx-templates-a.h:4 {{requires {{single|1}} argument}}
+  // expected-note@Inputs/cxx-templates-a.h:3 {{couldn't infer template argument}}
+  // expected-note@Inputs/cxx-templates-a.h:4 {{requires 1 argument}}
 
   N::f(0);
   N::f<double>(1.0);
   N::f<int>();
   N::f(); // expected-error {{no matching function}}
   // expected-note@Inputs/cxx-templates-b.h:6 {{couldn't infer template argument}}
-  // expected-note-re@Inputs/cxx-templates-a.h:7 {{requires {{single|1}} argument}}
+  // expected-note@Inputs/cxx-templates-b.h:7 {{requires single argument}}
 
   template_param_kinds_1<0>(); // ok, from cxx-templates-a.h
   template_param_kinds_1<int>(); // ok, from cxx-templates-b.h
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.
 
-- 
cgit v1.2.3