Merge commit 'e3fe1f9020b6' from swift/release/6.2 into stable/20240723

git apple-llvm automerger · git apple-llvm automerger · commit 3c40946a3080 · 2025-05-23T11:30:36.000-07:00
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -325,7 +325,7 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,
       auto file = HS.lookupModuleMapFile(*dir, is_framework);
       if (!file)
         return error();
-      if (!HS.loadModuleMapFile(*file, is_system))
+      if (HS.loadModuleMapFile(*file, is_system))
         return error();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ bool ClangModulesDeclVendorImpl::AddModule(const SourceModule &module,`
`325`	`325`	`auto file = HS.lookupModuleMapFile(*dir, is_framework);`
`326`	`326`	`if (!file)`
`327`	`327`	`return error();`
`328`		`- if (!HS.loadModuleMapFile(*file, is_system))`
	`328`	`+ if (HS.loadModuleMapFile(*file, is_system))`
`329`	`329`	`return error();`
`330`	`330`	`}`
`331`	`331`	`}`