fix merge conflicts

Author: kashika0112

clang/lib/Analysis/LifetimeSafety/Facts.cpp

@@ -44,13 +44,12 @@ void OriginFlowFact::dump(llvm::raw_ostream &OS, const LoanManager &,
 }
 
 void OriginEscapesFact::dump(llvm::raw_ostream &OS, const LoanManager &,
-                              const OriginManager &OM) const {
+                             const OriginManager &OM) const {
   OS << "OriginEscapes (";
   OM.dump(getEscapedOriginID(), OS);
   OS << ")\n";
 }
 
-
 void UseFact::dump(llvm::raw_ostream &OS, const LoanManager &,
                    const OriginManager &OM) const {
   OS << "Use (";
@@ -98,11 +97,10 @@ void FactManager::dump(const CFG &Cfg, AnalysisDeclContext &AC) const {
 
 llvm::ArrayRef<const Fact *>
 FactManager::getBlockContaining(ProgramPoint P) const {
-  for (const auto &Entry : BlockToFactsMap) {
-    const auto &Facts = Entry.second;
-    for (const Fact *F : Facts)
+  for (const auto &BlockToFactsVec : BlockToFacts) {
+    for (const Fact *F : BlockToFactsVec)
       if (F == P)
-        return Facts;
+        return BlockToFactsVec;
   }
   return {};
 }

clang/lib/Analysis/LifetimeSafety/LoanPropagation.cpp

@@ -58,12 +58,11 @@ static llvm::BitVector computePersistentOrigins(const FactManager &FactMgr,
         CheckOrigin(OF->getSrcOriginID());
         break;
       }
-      case Fact::Kind::ReturnOfOrigin:
-        CheckOrigin(F->getAs<ReturnOfOriginFact>()->getReturnedOriginID());
-        break;
       case Fact::Kind::Use:
         CheckOrigin(F->getAs<UseFact>()->getUsedOrigin());
         break;
+      case Fact::Kind::OriginEscapes:
+        break;
       case Fact::Kind::Expire:
       case Fact::Kind::TestPoint:
         break;

clang/test/Sema/warn-lifetime-safety.cpp

@@ -736,7 +736,8 @@ View lifetimebound_return_of_by_value_param(MyObj stack_param) {
 // FIXME: Fails to diagnose UAF when a reference to a by-value param escapes via an out-param.
 void uaf_from_by_value_param_failing(MyObj param, View* out_p) {
   *out_p = Identity(param);
-  
+}
+
 // Conditional operator.
 void conditional_operator_one_unsafe_branch(bool cond) {
   MyObj safe;