Be a little more permissive with -fmodules-ignore-macro= by removing everything after the second '=' if it is there.

llvm-svn: 174567

1 files changed, 2 insertions, 7 deletions

diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index 356bf3171cc..0c5a1fa70aa 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -754,13 +754,8 @@ namespace {
       : HSOpts(HSOpts) { }
 
     bool operator()(const std::pair<std::string, bool> &def) const {
-      // Dig out the macro name.
-      StringRef MacroName = def.first;
-      StringRef::size_type EqPos = MacroName.find('=');
-      if (EqPos != StringRef::npos)
-        MacroName = MacroName.substr(0, EqPos);
-
-      return HSOpts.ModulesIgnoreMacros.count(MacroName) > 0;
+      StringRef MacroDef = def.first;
+      return HSOpts.ModulesIgnoreMacros.count(MacroDef.split('=').first) > 0;
     }
   };
 }