[CIR] Remove inferred context from pointer type getters

[xlauko]

This mirror incubator changes from llvm/clangir#1600

[xlauko]

• [CIR] Remove implicit options from tablegen files #138860
• [CIR] Refactor VoidPtr constraint to CIR_VoidPtrType #138859
• [CIR] Remove inferred context from pointer type getters #138858 👈 (View in Graphite)
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clangir

Author: Henrich Lauko (xlauko)

Changes

This mirror incubator changes from llvm/clangir#1600

---

Full diff: https://github.com/llvm/llvm-project/pull/138858.diff

2 Files Affected:

• (modified) clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h (+1-1)
• (modified) clang/lib/CIR/CodeGen/CIRGenExpr.cpp (+1-1)

diff --git a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
index d96a1394b97f2..a63bf4f8858d0 100644
--- a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
+++ b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
@@ -111,7 +111,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
   cir::BoolType getBoolTy() { return cir::BoolType::get(getContext()); }
 
   cir::PointerType getPointerTo(mlir::Type ty) {
-    return cir::PointerType::get(getContext(), ty);
+    return cir::PointerType::get(ty);
   }
 
   cir::PointerType getVoidPtrTy() {
diff --git a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
index 94a6c03f7f1a4..67196f9f949c1 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
@@ -42,7 +42,7 @@ Address CIRGenFunction::emitAddrOfFieldStorage(Address base,
   mlir::Location loc = getLoc(field->getLocation());
 
   mlir::Type fieldType = convertType(field->getType());
-  auto fieldPtr = cir::PointerType::get(builder.getContext(), fieldType);
+  auto fieldPtr = cir::PointerType::get(fieldType);
   // For most cases fieldName is the same as field->getName() but for lambdas,
   // which do not currently carry the name, so it can be passed down from the
   // CaptureStmt.

[andykaylor]

lgtm

[xlauko]

Merge activity

• May 7, 1:16 PM EDT: A user started a stack merge that includes this pull request via Graphite.
• May 7, 1:18 PM EDT: Graphite rebased this pull request as part of a merge.
• May 7, 1:21 PM EDT: @xlauko merged this pull request with Graphite.