Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3):vendor/clang/clang-release_34-r197841

https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841

1 files changed, 9 insertions, 3 deletions

diff --git a/test/Modules/decldef.m b/test/Modules/decldef.m
index 7ed82b57e9c6..efd2d7c42c83 100644
--- a/test/Modules/decldef.m
+++ b/test/Modules/decldef.m
@@ -1,13 +1,16 @@
 // RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify -DUSE_EARLY
 // RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify
 
-// expected-note@Inputs/def.h:5 {{previous definition is here}}
+// expected-note@Inputs/def.h:5 {{previous}}
 
 @class Def;
 Def *def;
 
 @import decldef;
-A *a1; // expected-error{{unknown type name 'A'}}
+#ifdef USE_EARLY
+A *a1; // expected-error{{declaration of 'A' must be imported from module 'decldef.Def' before it is required}}
+#endif
 B *b1; // expected-error{{must use 'struct' tag to refer to type 'B'}}
 @import decldef.Decl;
 
@@ -15,7 +18,10 @@ A *a2;
 struct B *b;
 
 void testA(A *a) {
-  a->ivar = 17; // expected-error{{definition of 'A' must be imported from module 'decldef.Def' before it is required}}
+  a->ivar = 17;
+#ifndef USE_EARLY
+  // expected-error@-2{{definition of 'A' must be imported from module 'decldef.Def' before it is required}}
+#endif
 }
 
 void testB() {