1 files changed, 30 insertions, 13 deletions
diff --git a/clang/test/Modules/decldef.mm b/clang/test/Modules/decldef.mm
index 35694935dfb..2e2bd8a75e2 100644
--- a/clang/test/Modules/decldef.mm
+++ b/clang/test/Modules/decldef.mm
@@ -1,14 +1,18 @@
 // 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
+// RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify -DUSE_1 -DUSE_2 -DUSE_3 -DUSE_4
+// RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify -DUSE_2 -DUSE_3 -DUSE_4
+// RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify -DUSE_3 -DUSE_4
+// RUN: %clang_cc1 -fmodules -fobjc-arc -I %S/Inputs -fmodules-cache-path=%t %s -verify -DUSE_4
 
-// expected-note@Inputs/def.h:5 {{previous}}
+// expected-note@Inputs/def.h:5 0-1{{previous}}
+// expected-note@Inputs/def.h:16 0-1{{previous}}
+// expected-note@Inputs/def-include.h:11 0-1{{previous}}
 
 @class Def;
 Def *def;
-class Def2; // expected-note {{forward decl}}
+class Def2; // expected-note 0-1{{forward decl}}
 Def2 *def2;
-namespace Def3NS { class Def3; } // expected-note {{forward decl}}
+namespace Def3NS { class Def3; } // expected-note 0-1{{forward decl}}
 Def3NS::Def3 *def3;
 
 @interface Unrelated
@@ -16,9 +20,10 @@ Def3NS::Def3 *def3;
 @end
 
 @import decldef;
-#ifdef USE_EARLY
+#ifdef USE_1
 A *a1; // expected-error{{declaration of 'A' must be imported from module 'decldef.Def'}}
 B *b1;
+#define USED
 #endif
 @import decldef.Decl;
 
@@ -26,14 +31,23 @@ A *a2;
 B *b;
 
 void testA(A *a) {
+#ifdef USE_2
   a->ivar = 17;
-#ifndef USE_EARLY
+  #ifndef USED
   // expected-error@-2{{definition of 'A' must be imported from module 'decldef.Def' before it is required}}
+  #define USED
+  #endif
 #endif
 }
 
 void testB() {
-  B b; // Note: redundant error silenced
+#ifdef USE_3
+  B b;
+  #ifndef USED
+  // expected-error@-2{{definition of 'B' must be imported from module 'decldef.Def' before it is required}}
+  #define USED
+  #endif
+#endif
 }
 
 void testDef() {
@@ -41,9 +55,12 @@ void testDef() {
 }
 
 void testDef2() {
-  // FIXME: These should both work, since we've (implicitly) imported
-  // decldef.Def here, but they don't, because nothing has triggered the lazy
-  // loading of the definitions of these classes.
-  def2->func(); // expected-error {{incomplete}}
-  def3->func(); // expected-error {{incomplete}}
+#ifdef USE_4
+  def2->func();
+  def3->func();
+  #ifndef USED
+  // expected-error@-3 {{definition of 'Def2' must be imported}}
+  #define USED
+  #endif
+#endif
 }