[CIR][Lifetime] Use ownedby generation and add more consistency checks

Author: bcardosolopes

clang/lib/CIR/Dialect/Transforms/LifetimeCheck.cpp

@@ -163,7 +163,7 @@ struct LifetimeCheckPass : public LifetimeCheckBase<LifetimeCheckPass> {
       return val.getPointer();
     }
 
-    void dump(llvm::raw_ostream &OS = llvm::errs());
+    void dump(llvm::raw_ostream &OS = llvm::errs(), int ownedGen = 0);
 
     static State getInvalid() { return {Invalid}; }
     static State getNullPtr() { return {NullPtr}; }
@@ -1121,8 +1121,6 @@ void LifetimeCheckPass::checkCall(CallOp callOp) {
     // o’s first non-const use pset(o) becomes {o__2'}, on o’s second non-const
     // use pset(o) becomes {o__3'}, and so on.
     incOwner(ownerAddr);
-    // markPsetInvalid(addr, InvalidStyle::NonConstUseOfOwner,
-    //                 callOp.getLoc());
     return;
   }
 
@@ -1209,7 +1207,7 @@ void LifetimeCheckPass::LexicalScopeContext::dumpLocalValues() {
   llvm::errs() << "}\n";
 }
 
-void LifetimeCheckPass::State::dump(llvm::raw_ostream &OS) {
+void LifetimeCheckPass::State::dump(llvm::raw_ostream &OS, int ownedGen) {
   switch (val.getInt()) {
   case Invalid:
     OS << "invalid";
@@ -1224,7 +1222,8 @@ void LifetimeCheckPass::State::dump(llvm::raw_ostream &OS) {
     OS << getVarNameFromValue(val.getPointer());
     break;
   case OwnedBy:
-    OS << getVarNameFromValue(val.getPointer()) << "'";
+    ownedGen++; // Start from 1.
+    OS << getVarNameFromValue(val.getPointer()) << "__" << ownedGen << "'";
     break;
   default:
     llvm_unreachable("Not handled");
@@ -1235,7 +1234,10 @@ void LifetimeCheckPass::printPset(PSetType &pset, llvm::raw_ostream &OS) {
   OS << "{ ";
   auto size = pset.size();
   for (auto s : pset) {
-    s.dump(OS);
+    int ownerGen = 0;
+    if (s.isOwnedBy())
+      ownerGen = owners[s.getData()];
+    s.dump(OS, ownerGen);
     size--;
     if (size > 0)
       OS << ", ";

clang/test/CIR/Transforms/lifetime-check-owner.cpp

@@ -22,7 +22,7 @@ void yolo() {
   {
     MyIntOwner o(1);
     p = o;
-    *p = 3; // expected-remark {{pset => { o' }}}
+    *p = 3; // expected-remark {{pset => { o__1' }}}
   }       // expected-note {{pointee 'o' invalidated at end of scope}}
   *p = 4; // expected-warning {{use of invalid pointer 'p'}}
   // expected-remark@-1 {{pset => { invalid }}}
@@ -33,7 +33,13 @@ void yolo2() {
   MyIntOwner o(1);
   p = o;
   (void)o.read();
+  (void)p.read(); // expected-remark {{pset => { o__1' }}}
   o.changeInt(42); // expected-note {{invalidated by non-const use of owner type}}
   (void)p.read(); // expected-warning {{use of invalid pointer 'p'}}
   // expected-remark@-1 {{pset => { invalid }}}
+  p = o;
+  (void)p.read(); // expected-remark {{pset => { o__2' }}}
+  o.changeInt(33); // expected-note {{invalidated by non-const use of owner type}}
+  (void)p.read(); // expected-warning {{use of invalid pointer 'p'}}
+  // expected-remark@-1 {{pset => { invalid }}}
 }