* Update OpenACC test

* Failed function definition will not lead to FuncOp being erased
* Try to emit statements after a failure in a compound statement

Author: mmha

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -558,7 +558,6 @@ cir::FuncOp CIRGenFunction::generateCode(clang::GlobalDecl gd, cir::FuncOp fn,
       emitImplicitAssignmentOperatorBody(args);
     } else if (body) {
       if (mlir::failed(emitFunctionBody(body))) {
-        fn.erase();
         return nullptr;
       }
     } else {

clang/lib/CIR/CodeGen/CIRGenStmt.cpp

@@ -27,12 +27,13 @@ using namespace cir;
 
 mlir::LogicalResult CIRGenFunction::emitCompoundStmtWithoutScope(
     const CompoundStmt &s, Address *lastValue, AggValueSlot slot) {
+  mlir::LogicalResult result = mlir::success();
   const Stmt *exprResult = s.getStmtExprResult();
   assert((!lastValue || (lastValue && exprResult)) &&
          "If lastValue is not null then the CompoundStmt must have a "
          "StmtExprResult");
 
-  for (Stmt *curStmt : s.body()) {
+  for (const Stmt *curStmt : s.body()) {
     // We have to special case labels here. They are statements, but when put
     // at the end of a statement expression, they yield the value of their
     // subexpression. Handle this by walking through all labels we encounter,
@@ -66,11 +67,10 @@ mlir::LogicalResult CIRGenFunction::emitCompoundStmtWithoutScope(
       }
     } else {
       if (emitStmt(curStmt, /*useCurrentScope=*/false).failed())
-        return mlir::failure();
+        result = mlir::failure();
     }
   }
-
-  return mlir::success();
+  return result;
 }
 
 mlir::LogicalResult CIRGenFunction::emitCompoundStmt(const CompoundStmt &s,

clang/test/CIR/CodeGenOpenACC/openacc-not-implemented.cpp

@@ -2,8 +2,7 @@
 
 void HelloWorld(int *A, int *B, int *C, int N) {
 
-// expected-error@+2{{ClangIR code gen Not Yet Implemented: OpenACC Atomic Construct}}
-// expected-error@+1{{ClangIR code gen Not Yet Implemented: emitCompoundStmtWithoutScope: OpenACCAtomicConstruct}}
+// expected-error@+1{{ClangIR code gen Not Yet Implemented: OpenACC Atomic Construct}}
 #pragma acc atomic
   N = N + 1;