Remove patch for clang::CompoundStmt::replaceStmts

hahnjo · hahnjo · commit 2d304cf4888a · 2021-04-23T09:18:13.000+02:00
diff --git a/interpreter/cling/patches/clang-compoundstmt-replaceStmts.diff b/interpreter/cling/patches/clang-compoundstmt-replaceStmts.diff
diff --git a/interpreter/llvm/src/tools/clang/include/clang/AST/Stmt.h b/interpreter/llvm/src/tools/clang/include/clang/AST/Stmt.h
@@ -131,8 +131,7 @@ class alignas(void *) Stmt {
 
     unsigned : NumStmtBits;
 
-    unsigned WasReplaced : 1;
-    unsigned NumStmts : 32 - (NumStmtBits + 1);
+    unsigned NumStmts : 32 - NumStmtBits;
 
     /// The location of the opening "{".
     SourceLocation LBraceLoc;
@@ -1329,7 +1328,6 @@ class CompoundStmt final : public Stmt,
   explicit CompoundStmt(SourceLocation Loc)
       : Stmt(CompoundStmtClass), RBraceLoc(Loc) {
     CompoundStmtBits.NumStmts = 0;
-    CompoundStmtBits.WasReplaced = 0;
     CompoundStmtBits.LBraceLoc = Loc;
   }
 
@@ -1343,10 +1341,7 @@ class CompoundStmt final : public Stmt,
   using body_range = llvm::iterator_range<body_iterator>;
 
   body_range body() { return body_range(body_begin(), body_end()); }
-  body_iterator body_begin() {
-    Stmt** begin = getTrailingObjects<Stmt *>();
-    return !CompoundStmtBits.WasReplaced ? begin : (body_iterator)begin[0];
-  }
+  body_iterator body_begin() { return getTrailingObjects<Stmt *>(); }
   body_iterator body_end() { return body_begin() + size(); }
   Stmt *body_front() { return !body_empty() ? body_begin()[0] : nullptr; }
 
@@ -1362,7 +1357,7 @@ class CompoundStmt final : public Stmt,
   }
 
   const_body_iterator body_begin() const {
-    return const_cast<CompoundStmt*>(this)->body_begin();
+    return getTrailingObjects<Stmt *>();
   }
 
   const_body_iterator body_end() const { return body_begin() + size(); }
@@ -1396,8 +1391,6 @@ class CompoundStmt final : public Stmt,
     return const_reverse_body_iterator(body_begin());
   }
 
-  void replaceStmts(const ASTContext &C, llvm::ArrayRef<Stmt*> Stmts);
-
   // Get the Stmt that StmtExpr would consider to be the result of this
   // compound statement. This is used by StmtExpr to properly emulate the GCC
   // compound expression extension, which ignores trailing NullStmts when
diff --git a/interpreter/llvm/src/tools/clang/lib/AST/Stmt.cpp b/interpreter/llvm/src/tools/clang/lib/AST/Stmt.cpp
@@ -293,15 +293,14 @@ CompoundStmt::CompoundStmt(ArrayRef<Stmt *> Stmts, SourceLocation LB,
                            SourceLocation RB)
     : Stmt(CompoundStmtClass), RBraceLoc(RB) {
   CompoundStmtBits.NumStmts = Stmts.size();
-  CompoundStmtBits.WasReplaced = 0;
   setStmts(Stmts);
   CompoundStmtBits.LBraceLoc = LB;
 }
 
 void CompoundStmt::setStmts(ArrayRef<Stmt *> Stmts) {
   assert(CompoundStmtBits.NumStmts == Stmts.size() &&
          "NumStmts doesn't fit in bits of CompoundStmtBits.NumStmts!");
-  assert(!CompoundStmtBits.WasReplaced && "Call replaceStmts!");
+
   std::copy(Stmts.begin(), Stmts.end(), body_begin());
 }
 
@@ -317,32 +316,10 @@ CompoundStmt *CompoundStmt::CreateEmpty(const ASTContext &C,
   void *Mem =
       C.Allocate(totalSizeToAlloc<Stmt *>(NumStmts), alignof(CompoundStmt));
   CompoundStmt *New = new (Mem) CompoundStmt(EmptyShell());
-  New->CompoundStmtBits.WasReplaced = 0;
   New->CompoundStmtBits.NumStmts = NumStmts;
   return New;
 }
 
-void CompoundStmt::replaceStmts(const ASTContext &C,
-                                llvm::ArrayRef<Stmt*> Stmts) {
-  Stmt** Body = body_begin();
-
-  if (CompoundStmtBits.WasReplaced)
-    C.Deallocate(Body);
-  else
-    memset(body_begin(), 0, size());
-
-  CompoundStmtBits.NumStmts = Stmts.size();
-  assert(CompoundStmtBits.NumStmts == Stmts.size() &&
-         "NumStmts doesn't fit in bits of CompoundStmtBits.NumStmts!");
-
-  Body = new (C) Stmt*[Stmts.size()];
-  std::copy(Stmts.begin(), Stmts.end(), Body);
-
-  getTrailingObjects<Stmt *>()[0] = reinterpret_cast<Stmt*>(Body);
-
-  CompoundStmtBits.WasReplaced = 1;
-}
-
 const Expr *ValueStmt::getExprStmt() const {
   const Stmt *S = this;
   do {
