From fa00728f5815b1c3146678a3c180d469761b0b65 Mon Sep 17 00:00:00 2001 From: Nikola Smiljanic Date: Thu, 16 Jul 2015 01:06:17 +0000 Subject: PR10405 - Desugar FunctionType and TemplateSpecializationType if any type that appears inside needs to be desugared. llvm-svn: 242371 --- clang/test/ASTMerge/function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/test/ASTMerge') diff --git a/clang/test/ASTMerge/function.c b/clang/test/ASTMerge/function.c index 89e1c699c3a..650f719d1fa 100644 --- a/clang/test/ASTMerge/function.c +++ b/clang/test/ASTMerge/function.c @@ -3,7 +3,7 @@ // RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s -// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' vs. 'void (int, float)') +// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') // CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' // CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') // CHECK: function1.c:4:6: note: declared here with type 'void (void)' -- cgit v1.2.3