Apply requested reviews

Author: Andres-Salamanca

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -1064,7 +1064,8 @@ def CIR_BrOp : CIR_Op<"br",[
 // LabelOp
 //===----------------------------------------------------------------------===//
 
-// The LabelOp has AlwaysSpeculatable trait in order to not to be swept by canonicalizer
+// The LabelOp has AlwaysSpeculatable trait in order to not to be swept
+// by canonicalizer
 def CIR_LabelOp : CIR_Op<"label", [AlwaysSpeculatable]> {
   let description = [{
     An identifier which may be referred by cir.goto operation

clang/lib/CIR/CodeGen/CIRGenFunction.h

@@ -1125,7 +1125,7 @@ class CIRGenFunction : public CIRGenTypeCache {
 
   mlir::Value emitOpOnBoolExpr(mlir::Location loc, const clang::Expr *cond);
 
-  mlir::LogicalResult emitLabel(const clang::LabelDecl *d);
+  mlir::LogicalResult emitLabel(const clang::LabelDecl &d);
   mlir::LogicalResult emitLabelStmt(const clang::LabelStmt &s);
 
   mlir::LogicalResult emitIfStmt(const clang::IfStmt &s);

clang/lib/CIR/CodeGen/CIRGenStmt.cpp

@@ -277,11 +277,11 @@ mlir::LogicalResult CIRGenFunction::emitSimpleStmt(const Stmt *s,
 
 mlir::LogicalResult CIRGenFunction::emitLabelStmt(const clang::LabelStmt &s) {
 
-  if (emitLabel(s.getDecl()).failed())
+  if (emitLabel(*s.getDecl()).failed())
     return mlir::failure();
 
-  // IsEHa: not implemented.
-  assert(!(getContext().getLangOpts().EHAsynch && s.isSideEntry()));
+if (getContext().getLangOpts().EHAsynch && s.isSideEntry())
+    getCIRGenModule().errorNYI(s.getSourceRange(), "IsEHa: not implemented.");
 
   return emitStmt(s.getSubStmt(), /*useCurrentScope*/ true);
 }
@@ -443,7 +443,7 @@ CIRGenFunction::emitContinueStmt(const clang::ContinueStmt &s) {
   return mlir::success();
 }
 
-mlir::LogicalResult CIRGenFunction::emitLabel(const clang::LabelDecl *d) {
+mlir::LogicalResult CIRGenFunction::emitLabel(const clang::LabelDecl &d) {
   // Create a new block to tag with a label and add a branch from
   // the current one to it. If the block is empty just call attach it
   // to this label.
@@ -455,11 +455,11 @@ mlir::LogicalResult CIRGenFunction::emitLabel(const clang::LabelDecl *d) {
       mlir::OpBuilder::InsertionGuard guard(builder);
       labelBlock = builder.createBlock(builder.getBlock()->getParent());
     }
-    builder.create<cir::BrOp>(getLoc(d->getSourceRange()), labelBlock);
+    builder.create<cir::BrOp>(getLoc(d.getSourceRange()), labelBlock);
   }
 
   builder.setInsertionPointToEnd(labelBlock);
-  builder.create<cir::LabelOp>(getLoc(d->getSourceRange()), d->getName());
+  builder.create<cir::LabelOp>(getLoc(d.getSourceRange()), d.getName());
   builder.setInsertionPointToEnd(labelBlock);
 
   //  FIXME: emit debug info for labels, incrementProfileCounter

clang/test/CIR/CodeGen/label.c

@@ -12,6 +12,9 @@ void label() {
 // CIR:    cir.label "labelA"
 // CIR:    cir.return
 
+// Note: We are not lowering to LLVM IR via CIR at this stage because that
+// process depends on the GotoSolver.
+
 // OGCG: define dso_local void @label
 // OGCG:   br label %labelA
 // OGCG: labelA:
@@ -63,3 +66,38 @@ void label_in_if(int cond) {
 // OGCG:   br label %if.end
 // OGCG: if.end:
 // OGCG:   ret void
+
+void after_return() {
+  return;
+  label:
+}
+
+// CIR:  cir.func no_proto dso_local @after_return
+// CIR:    cir.br ^bb1
+// CIR:  ^bb1:  // 2 preds: ^bb0, ^bb2
+// CIR:    cir.return
+// CIR:  ^bb2:  // no predecessors
+// CIR:    cir.label "label"
+// CIR:    cir.br ^bb1
+
+// OGCG: define dso_local void @after_return
+// OGCG:   br label %label
+// OGCG: label:
+// OGCG:   ret void
+
+
+void after_unreachable() {
+  __builtin_unreachable();
+  label:
+}
+
+// CIR:  cir.func no_proto dso_local @after_unreachable
+// CIR:    cir.unreachable
+// CIR:  ^bb1:
+// CIR:    cir.label "label"
+// CIR:    cir.return
+
+// OGCG: define dso_local void @after_unreachable
+// OGCG:   unreachable
+// OGCG: label:
+// OGCG:   ret void

clang/test/CIR/IR/invalid-label.cir

@@ -0,0 +1,12 @@
+// RUN: cir-opt %s -verify-diagnostics -split-input-file
+
+!s32i = !cir.int<s, 32>
+
+module  {
+  // expected-error@+3 {{must be the first operation in a block}}
+  cir.func @error(){
+    %0 = cir.const #cir.int<0> : !s32i
+    cir.label "label"
+    cir.return
+  }
+}