Replace non-working scope handling with a missing feature

Author: andykaylor

clang/include/clang/CIR/MissingFeatures.h

@@ -226,6 +226,7 @@ struct MissingFeatures {
   static bool cleanupAppendInsts() { return false; }
   static bool cleanupBranchThrough() { return false; }
   static bool cleanupIndexAndBIAdjustment() { return false; }
+  static bool cleanupWithPreservedValues() { return false; }
   static bool cleanupsToDeactivate() { return false; }
   static bool constEmitterAggILE() { return false; }
   static bool constEmitterArrayILE() { return false; }

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -923,31 +923,9 @@ LValue CIRGenFunction::emitLValue(const Expr *e) {
     return emitCallExprLValue(cast<CallExpr>(e));
   case Expr::ExprWithCleanupsClass: {
     const auto *cleanups = cast<ExprWithCleanups>(e);
-    LValue lv;
-
-    mlir::Location scopeLoc = getLoc(e->getSourceRange());
-    [[maybe_unused]] auto scope = cir::ScopeOp::create(
-        builder, scopeLoc, /*scopeBuilder=*/
-        [&](mlir::OpBuilder &b, mlir::Location loc) {
-          CIRGenFunction::LexicalScope lexScope{*this, loc,
-                                                builder.getInsertionBlock()};
-
-          lv = emitLValue(cleanups->getSubExpr());
-          if (lv.isSimple()) {
-            // Defend against branches out of gnu statement expressions
-            // surrounded by cleanups.
-            Address addr = lv.getAddress();
-            mlir::Value v = addr.getPointer();
-            assert(!cir::MissingFeatures::addressIsKnownNonNull());
-            assert(!cir::MissingFeatures::opTBAA());
-            assert(!cir::MissingFeatures::objCGC());
-            lv = LValue::makeAddr(addr.withPointer(v), lv.getType(),
-                                  lv.getBaseInfo());
-          }
-        });
-
-    // FIXME: Is it possible to create an ExprWithCleanups that produces a
-    // bitfield lvalue or some other non-simple lvalue?
+    RunCleanupsScope scope(*this);
+    LValue lv = emitLValue(cleanups->getSubExpr());
+    assert(!cir::MissingFeatures::cleanupWithPreservedValues());
     return lv;
   }
   case Expr::ParenExprClass:

clang/test/CIR/CodeGen/temporary-materialization.cpp

@@ -15,22 +15,16 @@ int test() {
 //      CIR: cir.func {{.*}} @_Z4testv()
 //      CIR:   %[[TEMP_SLOT:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["ref.tmp0", init]
 // CIR-NEXT:   %[[X:.*]] = cir.alloca !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>>, ["x", init, const]
-// CIR-NEXT:   cir.scope {
-// CIR-NEXT:     %[[TEMP_VALUE:.*]] = cir.call @_Z8make_intv() : () -> !s32i
-// CIR-NEXT:     cir.store{{.*}} %[[TEMP_VALUE]], %[[TEMP_SLOT]]
-// CIR-NEXT:   }
+// CIR-NEXT:   %[[TEMP_VALUE:.*]] = cir.call @_Z8make_intv() : () -> !s32i
+// CIR-NEXT:   cir.store{{.*}} %[[TEMP_VALUE]], %[[TEMP_SLOT]]
 // CIR-NEXT:   cir.store{{.*}} %[[TEMP_SLOT]], %[[X]]
 
 // LLVM: define {{.*}} i32 @_Z4testv()
 // LLVM:   %[[RETVAL:.*]] = alloca i32
 // LLVM:   %[[TEMP_SLOT:.*]] = alloca i32
 // LLVM:   %[[X:.*]] = alloca ptr
-// LLVM:   br label %[[SCOPE_LABEL:.*]]
-// LLVM: [[SCOPE_LABEL]]:
 // LLVM:   %[[TEMP_VALUE:.*]] = call i32 @_Z8make_intv()
 // LLVM:   store i32 %[[TEMP_VALUE]], ptr %[[TEMP_SLOT]]
-// LLVM:   br label %[[SCOPE_END_LABEL:.*]]
-// LLVM: [[SCOPE_END_LABEL]]:
 // LLVM:   store ptr %[[TEMP_SLOT]], ptr %[[X]]
 
 // OGCG: define {{.*}} i32 @_Z4testv()
@@ -54,10 +48,8 @@ int test_scoped() {
 //      CIR:   cir.scope {
 // CIR-NEXT:     %[[TEMP_SLOT:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["ref.tmp0", init]
 // CIR-NEXT:     %[[Y_ADDR:.*]] = cir.alloca !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>>, ["y", init, const]
-// CIR-NEXT:     cir.scope {
-// CIR-NEXT:       %[[TEMP_VALUE:.*]] = cir.call @_Z8make_intv() : () -> !s32i
-// CIR-NEXT:       cir.store{{.*}} %[[TEMP_VALUE]], %[[TEMP_SLOT]] : !s32i, !cir.ptr<!s32i>
-// CIR-NEXT:     }
+// CIR-NEXT:     %[[TEMP_VALUE:.*]] = cir.call @_Z8make_intv() : () -> !s32i
+// CIR-NEXT:     cir.store{{.*}} %[[TEMP_VALUE]], %[[TEMP_SLOT]] : !s32i, !cir.ptr<!s32i>
 // CIR-NEXT:     cir.store{{.*}} %[[TEMP_SLOT]], %[[Y_ADDR]] : !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>>
 // CIR-NEXT:     %[[Y_REF:.*]] = cir.load %[[Y_ADDR]] : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!s32i>
 // CIR-NEXT:     %[[Y_VALUE:.*]] = cir.load{{.*}} %[[Y_REF]] : !cir.ptr<!s32i>, !s32i
@@ -73,12 +65,8 @@ int test_scoped() {
 // LLVM:   store i32 %[[TEMP_VALUE1]], ptr %[[X]]
 // LLVM:   br label %[[SCOPE_LABEL:.*]]
 // LLVM: [[SCOPE_LABEL]]:
-// LLVM:   br label %[[INNER_SCOPE_LABEL:.*]]
-// LLVM: [[INNER_SCOPE_LABEL]]:
 // LLVM:   %[[TEMP_VALUE2:.*]] = call i32 @_Z8make_intv()
 // LLVM:   store i32 %[[TEMP_VALUE2]], ptr %[[TEMP_SLOT]]
-// LLVM:   br label %[[INNER_SCOPE_END_LABEL:.*]]
-// LLVM: [[INNER_SCOPE_END_LABEL]]:
 // LLVM:   store ptr %[[TEMP_SLOT]], ptr %[[Y_ADDR]]
 // LLVM:   %[[Y_REF:.*]] = load ptr, ptr %[[Y_ADDR]]
 // LLVM:   %[[Y_VALUE:.*]] = load i32, ptr %[[Y_REF]]