Address review feedback

Author: andykaylor

clang/lib/CIR/CodeGen/CIRGenConstantEmitter.h

@@ -82,15 +82,17 @@ class ConstantEmitter {
   mlir::Attribute tryEmitAbstractForInitializer(const VarDecl &d);
 
 private:
-  struct AbstractState {
+  class AbstractStateRAII {
+    ConstantEmitter &emitter;
     bool oldValue;
+
+  public:
+    AbstractStateRAII(ConstantEmitter &emitter, bool value)
+        : emitter(emitter), oldValue(emitter.abstract) {
+      emitter.abstract = value;
+    }
+    ~AbstractStateRAII() { emitter.abstract = oldValue; }
   };
-  AbstractState pushAbstract() {
-    AbstractState saved = {abstract};
-    abstract = true;
-    return saved;
-  }
-  mlir::Attribute validateAndPopAbstract(mlir::Attribute C, AbstractState save);
 };
 
 } // namespace clang::CIRGen

clang/lib/CIR/CodeGen/CIRGenDecl.cpp

@@ -75,6 +75,12 @@ bool CIRGenFunction::isTrivialInitializer(const Expr *init) {
 
 void CIRGenFunction::emitAutoVarInit(
     const CIRGenFunction::AutoVarEmission &emission) {
+  assert(emission.Variable && "emission was not valid!");
+
+  // If this was emitted as a global constant, we're done.
+  if (emission.wasEmittedAsGlobal())
+    return;
+
   const VarDecl &d = *emission.Variable;
 
   QualType type = d.getType();
@@ -209,22 +215,17 @@ void CIRGenFunction::emitVarDecl(const VarDecl &d) {
 
 void CIRGenFunction::emitScalarInit(const Expr *init, mlir::Location loc,
                                     LValue lvalue, bool capturedByInit) {
-  Qualifiers::ObjCLifetime lifetime = Qualifiers::ObjCLifetime::OCL_None;
   assert(!cir::MissingFeatures::objCLifetime());
 
-  if (!lifetime) {
-    SourceLocRAIIObject locRAII{*this, loc};
-    mlir::Value value = emitScalarExpr(init);
-    if (capturedByInit) {
-      cgm.errorNYI(init->getSourceRange(), "emitScalarInit: captured by init");
-      return;
-    }
-    assert(!cir::MissingFeatures::emitNullabilityCheck());
-    emitStoreThroughLValue(RValue::get(value), lvalue, true);
+  SourceLocRAIIObject locRAII{*this, loc};
+  mlir::Value value = emitScalarExpr(init);
+  if (capturedByInit) {
+    cgm.errorNYI(init->getSourceRange(), "emitScalarInit: captured by init");
     return;
   }
-
-  cgm.errorNYI(loc, "emitScalarInit: ObjCLifetime");
+  assert(!cir::MissingFeatures::emitNullabilityCheck());
+  emitStoreThroughLValue(RValue::get(value), lvalue, true);
+  return;
 }
 
 void CIRGenFunction::emitExprAsInit(const Expr *init, const ValueDecl *d,

clang/lib/CIR/CodeGen/CIRGenExprConstant.cpp

@@ -169,20 +169,10 @@ static QualType getNonMemoryType(CIRGenModule &cgm, QualType type) {
 //                             ConstantEmitter
 //===----------------------------------------------------------------------===//
 
-mlir::Attribute ConstantEmitter::validateAndPopAbstract(mlir::Attribute c,
-                                                        AbstractState saved) {
-  abstract = saved.oldValue;
-
-  // No validation necessary for now.
-  // No cleanup to do for now.
-  return c;
-}
-
 mlir::Attribute
 ConstantEmitter::tryEmitAbstractForInitializer(const VarDecl &d) {
-  AbstractState state = pushAbstract();
-  mlir::Attribute c = tryEmitPrivateForVarInit(d);
-  return validateAndPopAbstract(c, state);
+  AbstractStateRAII state(*this, true);
+  return tryEmitPrivateForVarInit(d);
 }
 
 mlir::Attribute ConstantEmitter::tryEmitPrivateForVarInit(const VarDecl &d) {
@@ -241,11 +231,10 @@ mlir::Attribute ConstantEmitter::tryEmitPrivateForMemory(const APValue &value,
 mlir::Attribute ConstantEmitter::emitAbstract(SourceLocation loc,
                                               const APValue &value,
                                               QualType destType) {
-  AbstractState state = pushAbstract();
+  AbstractStateRAII state(*this, true);
   mlir::Attribute c = tryEmitPrivate(value, destType);
-  c = validateAndPopAbstract(c, state);
   if (!c)
-    cgm.errorNYI(loc, "emitAbstract failed");
+    cgm.errorNYI(loc, "emitAbstract failed, emit null constaant");
   return c;
 }
 
@@ -266,8 +255,6 @@ mlir::Attribute ConstantEmitter::tryEmitPrivate(const APValue &value,
   switch (value.getKind()) {
   case APValue::None:
   case APValue::Indeterminate:
-    // TODO(cir): LLVM models out-of-lifetime and indeterminate values as
-    // 'undef'. Find out what's better for CIR.
     cgm.errorNYI("ConstExprEmitter::tryEmitPrivate none or indeterminate");
     return {};
   case APValue::Int: {