[CIR][CIRGen][Bugfix] Fix source location in ctors (llvm#415)

eZWALT · Apr 17, 2024 · 598f1d5 · 598f1d5
1 parent efea52f
commit 598f1d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/clang/lib/CIR/CodeGen/CIRGenDecl.cpp b/clang/lib/CIR/CodeGen/CIRGenDecl.cpp
@@ -657,8 +657,8 @@ void CIRGenFunction::buildNullabilityCheck(LValue LHS, mlir::Value RHS,
 void CIRGenFunction::buildScalarInit(const Expr *init, mlir::Location loc,
                                      LValue lvalue, bool capturedByInit) {
   // TODO: this is where a lot of ObjC lifetime stuff would be done.
-  mlir::Value value = buildScalarExpr(init);
   SourceLocRAIIObject Loc{*this, loc};
+  mlir::Value value = buildScalarExpr(init);
   buildStoreThroughLValue(RValue::get(value), lvalue);
   return;
 }

diff --git a/clang/test/CIR/CodeGen/ctor-srcloc-fix.cpp b/clang/test/CIR/CodeGen/ctor-srcloc-fix.cpp
@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir-enable -emit-cir %s -o %t.cir
+// RUN: FileCheck --input-file=%t.cir %s
+
+struct e { e(int); };
+e *g = new e(0);
+
+//CHECK:  {{%.*}} = cir.const(#cir.int<1> : !u64i) : !u64i loc(#loc11)
+//CHECK:  {{%.*}} = cir.call @_Znwm(%1) : (!u64i) -> !cir.ptr<!void> loc(#loc6)