Merge pull request #15950 from gottesmm/pr-ad010a566f73a3f80c1bce1ac1d652208c260c8b

swift-ci · web-flow · commit 80defe51b7d6 · 2018-04-16T10:51:52.000-07:00
diff --git a/include/swift/Frontend/FrontendInputsAndOutputs.h b/include/swift/Frontend/FrontendInputsAndOutputs.h
@@ -139,7 +139,7 @@ class FrontendInputsAndOutputs {
 
   bool isInputPrimary(StringRef file) const;
 
-  unsigned numberOfPrimaryInputsEndingWith(const char *extension) const;
+  unsigned numberOfPrimaryInputsEndingWith(StringRef extension) const;
 
   // Multi-facet readers
 
diff --git a/lib/Frontend/FrontendInputsAndOutputs.cpp b/lib/Frontend/FrontendInputsAndOutputs.cpp
@@ -134,7 +134,7 @@ bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {
 }
 
 unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith(
-    const char *extension) const {
+    StringRef extension) const {
   unsigned n = 0;
   (void)forEachPrimaryInput([&](const InputFile &input) -> bool {
     if (llvm::sys::path::extension(input.file()).endswith(extension))

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith(`
`137`		`- const char *extension) const {`
	`137`	`+ StringRef extension) const {`
`138`	`138`	`unsigned n = 0;`
`139`	`139`	`(void)forEachPrimaryInput([&](const InputFile &input) -> bool {`
`140`	`140`	`if (llvm::sys::path::extension(input.file()).endswith(extension))`