Fix an assert in the implementation of -Wquoted-include-in-framework-header

[erik.pilkington]

Summary

rdar://43692300

[erik.pilkington]

clang/lib/Lex/HeaderSearch.cpp

670

Crash was here, if ToFramework is empty because no "Foo.framework" entry found in the path.

[bruno]

Hi Erik,

Thanks for catching this.

Can you rename the test and the input file path to something more meaningful? Better yet if you remove the radar bits. I think you can actually squeeze this test in test/Modules/double-quotes.m.

[erik.pilkington]

Sure, the new patch moves the test to double-quotes.m and gives it a more meaningful name.

Thanks!

[bruno]

LGTM with one more small change.

clang/test/Modules/double-quotes.m

35

Please write a meaningful message here instead, the radar number in the commit message should be enough to track this down later if needed.

clang/lib/Lex/HeaderSearch.cpp

     }
     if (*I == "PrivateHeaders") {
       ++FoundComp;
       IsPrivateHeader = true;
     }
     ++I;
   }
 
-  return FoundComp >= 2;
+  return !FrameworkName.empty() && FoundComp >= 2;
 }
 
 static void
 diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc,
                          StringRef Includer, StringRef IncludeFilename,
                          const FileEntry *IncludeFE, bool isAngled = false,
                          bool FoundByHeaderMap = false) {
   bool IsIncluderPrivateHeader = false;
   SmallString<128> FromFramework, ToFramework;
   if (!isFrameworkStylePath(Includer, IsIncluderPrivateHeader, FromFramework))
     return;
   bool IsIncludeePrivateHeader = false;
   bool IsIncludeeInFramework = isFrameworkStylePath(
       IncludeFE->getName(), IsIncludeePrivateHeader, ToFramework);
 
   if (!isAngled && !FoundByHeaderMap) {
     SmallString<128> NewInclude("<");
     if (IsIncludeeInFramework) {
       NewInclude += StringRef(ToFramework).drop_back(10); // drop .framework
       NewInclude += "/";
     }
     NewInclude += IncludeFilename;
     NewInclude += ">";
     Diags.Report(IncludeLoc, diag::warn_quoted_include_in_framework_header)
         << IncludeFilename
         << FixItHint::CreateReplacement(IncludeLoc, NewInclude);
   }

clang/test/Modules/Inputs/double-quotes/NotAFramework/Headers/Headers/Thing1.h

+#include "Thing2.h"

clang/test/Modules/Inputs/double-quotes/NotAFramework/Headers/Headers/Thing2.h

+// Empty file!

clang/test/Modules/double-quotes.m

 // RUN: FileCheck --input-file=%t/stderr %s
 // CHECK: double-quoted include "A0.h" in framework header, expected angle-bracketed instead
 // CHECK: double-quoted include "B.h" in framework header, expected angle-bracketed instead
 // CHECK: double-quoted include "B.h" in framework header, expected angle-bracketed instead
 
 #import "A.h"
 #import <Z/Z.h>
 
+// rdar://43692300
+#import "NotAFramework/Headers/Headers/Thing1.h"
+
 int bar() { return foo(); }
 
 // expected-warning@Inputs/double-quotes/A.framework/Headers/A.h:1{{double-quoted include "A0.h" in framework header, expected angle-bracketed instead}}
 // expected-warning@Inputs/double-quotes/A.framework/Headers/A.h:2{{double-quoted include "B.h" in framework header, expected angle-bracketed instead}}
 // expected-warning@Inputs/double-quotes/flat-header-path/Z.h:1{{double-quoted include "B.h" in framework header, expected angle-bracketed instead}}