Revert "[lldb][Modules] Fix error handling of parseAndLoadModuleMapFile (llvm#141220)"

jasonmolenda · jasonmolenda · commit 57f3151a3144 · 2025-05-29T01:30:02.000-07:00
The TestTemplateWithSameArg.py API test is crashing on macOS with this change. Michael is going to look into it; reverting for now to unblock the CI bots. This reverts commit 052c704.
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -330,7 +330,7 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,
       auto file = HS.lookupModuleMapFile(*dir, is_framework);
       if (!file)
         return error();
-      if (HS.parseAndLoadModuleMapFile(*file, is_system))
+      if (!HS.parseAndLoadModuleMapFile(*file, is_system))
         return error();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,`
`330`	`330`	`auto file = HS.lookupModuleMapFile(*dir, is_framework);`
`331`	`331`	`if (!file)`
`332`	`332`	`return error();`
`333`		`- if (HS.parseAndLoadModuleMapFile(*file, is_system))`
	`333`	`+ if (!HS.parseAndLoadModuleMapFile(*file, is_system))`
`334`	`334`	`return error();`
`335`	`335`	`}`
`336`	`336`	`}`