[PATCH] D52253: Fix an assert in the implementation of -Wquoted-include-in-framework-header

[Erik Pilkington via Phabricator via cfe-commits]

erik.pilkington created this revision.
erik.pilkington added a reviewer: bruno.
Herald added a subscriber: dexonsmith.

rdar://43692300


Repository:
  rC Clang

https://reviews.llvm.org/D52253

Files:
  clang/lib/Lex/HeaderSearch.cpp
  clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File.h
  clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File0.h
  clang/test/Frontend/rdar43692300.m


Index: clang/test/Frontend/rdar43692300.m
===================================================================
--- /dev/null
+++ clang/test/Frontend/rdar43692300.m
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -I %S/Inputs %s
+
+// expected-no-diagnostics
+
+#include "Radar43692300/Headers/Headers/File.h"
+
+int main()
+{
+}
Index: clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File0.h
===================================================================
--- /dev/null
+++ clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File0.h
@@ -0,0 +1 @@
+// This file is empty!
Index: clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File.h
===================================================================
--- /dev/null
+++ clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File.h
@@ -0,0 +1 @@
+#include "File0.h"
Index: clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang/lib/Lex/HeaderSearch.cpp
+++ clang/lib/Lex/HeaderSearch.cpp
@@ -648,7 +648,7 @@
     ++I;
   }
 
-  return FoundComp >= 2;
+  return !FrameworkName.empty() && FoundComp >= 2;
 }
 
 static void



Index: clang/test/Frontend/rdar43692300.m
===================================================================
--- /dev/null
+++ clang/test/Frontend/rdar43692300.m
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -I %S/Inputs %s
+
+// expected-no-diagnostics
+
+#include "Radar43692300/Headers/Headers/File.h"
+
+int main()
+{
+}
Index: clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File0.h
===================================================================
--- /dev/null
+++ clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File0.h
@@ -0,0 +1 @@
+// This file is empty!
Index: clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File.h
===================================================================
--- /dev/null
+++ clang/test/Frontend/Inputs/Radar43692300/Headers/Headers/File.h
@@ -0,0 +1 @@
+#include "File0.h"
Index: clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang/lib/Lex/HeaderSearch.cpp
+++ clang/lib/Lex/HeaderSearch.cpp
@@ -648,7 +648,7 @@
     ++I;
   }
 
-  return FoundComp >= 2;
+  return !FrameworkName.empty() && FoundComp >= 2;
 }
 
 static void

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits