Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions clang/lib/CIR/CodeGen/CIRGenBuiltin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,12 @@ decodeFixedType(ArrayRef<llvm::Intrinsic::IITDescriptor> &infos,
unsigned numElements = descriptor.Vector_Width.getFixedValue();
return cir::VectorType::get(context, elementType, numElements);
}
case IITDescriptor::Pointer:
llvm_unreachable("NYI: IITDescriptor::Pointer");
case IITDescriptor::Pointer: {
mlir::Type pointee = {};
auto addrSpace =
static_cast<cir::AddressSpace>(descriptor.Pointer_AddressSpace);
return cir::PointerType::get(pointee, addrSpace);
}
case IITDescriptor::Struct:
llvm_unreachable("NYI: IITDescriptor::Struct");
case IITDescriptor::Argument:
Expand Down Expand Up @@ -564,6 +568,29 @@ static mlir::Type getIntrinsicArgumentTypeFromAST(mlir::Type iitType,
return iitType;
}

// Ensures a pointer argument matches the expected CIR pointer type,
// emitting an addrspacecast for address-space mismatches only.
static mlir::Value getCorrectedPtr(mlir::Value argValue, mlir::Type expectedTy,
CIRGenBuilderTy &builder) {
mlir::Type argType = argValue.getType();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this doesn't exist in OG, let's just add a few asserts to clean this up:

auto ptrType = mlir::dyn_cast<cir::PointerType>(argType);
assert(ptrType && "expected pointer type");
assert(ptrType.getPointee() != expectedPtrType.getPointee() && "types should not match");

if (isa<cir::PointerType>(argType)) {
auto ptrType = mlir::cast<cir::PointerType>(argType);
auto expectedPtrType = mlir::cast<cir::PointerType>(expectedTy);
if (ptrType.getPointee() != expectedPtrType.getPointee()) {
if (expectedPtrType.getAddrSpace() != ptrType.getAddrSpace()) {
auto newPtrType = cir::PointerType::get(ptrType.getPointee(),
expectedPtrType.getAddrSpace());
return builder.createAddrSpaceCast(argValue, newPtrType);
}
} else {
llvm_unreachable("NYI");
}
} else {
llvm_unreachable("NYI");
}
return argValue;
}

static cir::FuncType getIntrinsicType(mlir::MLIRContext *context,
llvm::Intrinsic::ID id) {
using namespace llvm::Intrinsic;
Expand Down Expand Up @@ -2804,7 +2831,7 @@ RValue CIRGenFunction::emitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
getIntrinsicArgumentTypeFromAST(expectedTy, E, i, &getMLIRContext());

if (argType != correctedExpectedTy)
llvm_unreachable("NYI");
argValue = getCorrectedPtr(argValue, expectedTy, builder);

args.push_back(argValue);
}
Expand Down